Defaults in wxWinCE documented.

[wxWidgets.git] / samples / htlbox / Makefile.in

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index f062b772f08d7f1e0096d5b08a7f8f797156e97b..cac9294292985e490915d518c1560e246d823b81 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
@@ -38,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).1
 LIBDIRNAME = $(top_builddir)lib
 HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
        $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o htlbox$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -155,7 +154,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
        $(__htlbox___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p htlbox.app/Contents
        mkdir -p htlbox.app/Contents/MacOS
        mkdir -p htlbox.app/Contents/Resources
@@ -173,7 +172,6 @@ htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
        ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc htlbox.app/Contents/Resources/htlbox.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP)