Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index bbf601e8237d5eb3bbe98e30b6274503f0581e20..c512b33ddb9bcd0d5f4cf503c90fd3568db5932c 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@

-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@


@@ -36,8 +35,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).5
+WX_RELEASE = 2.6
+WX_VERSION = $(WX_RELEASE).0

 LIBDIRNAME = $(top_builddir)lib
 TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 LIBDIRNAME = $(top_builddir)lib
 TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \


@@ -122,7 +121,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 toolbar$(EXEEXT) Carbon.r \
        __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 toolbar$(EXEEXT) Carbon.r \

-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -151,7 +150,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
        $(__toolbar___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__toolbar___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p toolbar.app/Contents
        mkdir -p toolbar.app/Contents/MacOS
        mkdir -p toolbar.app/Contents/Resources
        mkdir -p toolbar.app/Contents
        mkdir -p toolbar.app/Contents/MacOS
        mkdir -p toolbar.app/Contents/Resources


@@ -169,7 +168,6 @@ toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
        ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar
        
        
        ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar
        
        

-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc toolbar.app/Contents/Resources/toolbar.rsrc

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP)
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP)