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

[wxWidgets.git] / demos / bombs / Makefile.in

diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index ca78ff3ca8031836e898185601ed8db876a40575..a84c2bbef7bfa639be792be5274123f08ef975fc 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/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@


@@ -123,7 +122,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 bombs$(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 bombs$(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: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -152,7 +151,7 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
        $(__bombs___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__bombs___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

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

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


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

-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc bombs.app/Contents/Resources/bombs.rsrc

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@bombs_bundle: $(____bombs_BUNDLE_TGT_REF_DEP)
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@bombs_bundle: $(____bombs_BUNDLE_TGT_REF_DEP)