compilation fix for WXWIN_COMPATIBILITY_2_2 (bug 1252476)

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

diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index da66d4c1900b20728970416085f263ef576516ce..c0e2b45ba05928a80e0b01ae97cd6eaa52d8ace8 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -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_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@


@@ -38,11 +37,12 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).3
+WX_RELEASE = 2.6
+WX_VERSION = $(WX_RELEASE).2

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 FORTY_OBJECTS =  \
        $(__forty_os2_lib_res) \
        forty_forty.o \
 FORTY_OBJECTS =  \
        $(__forty_os2_lib_res) \
        forty_forty.o \


@@ -77,6 +77,15 @@ FORTY_OBJECTS =  \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS

 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL


@@ -124,9 +133,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \

-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       __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 forty$(EXEEXT) Carbon.r \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o forty$(EXEEXT) Carbon.r \

-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.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: ###


@@ -146,7 +156,7 @@ clean:
        rm -rf forty.app
 
 distclean: clean
        rm -rf forty.app
 
 distclean: clean

-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile

 
 forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
        $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
 
 forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
        $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)


@@ -155,7 +165,7 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
        $(__forty___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__forty___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

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

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


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

-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc forty.app/Contents/Resources/forty.rsrc

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP)
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP)


@@ -181,37 +190,41 @@ forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
 data: 
        @mkdir -p .
        @for f in about.htm; do \
 data: 
        @mkdir -p .
        @for f in about.htm; do \

-       if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
-       cp -pRf $(srcdir)/$$f . ; \
+       if test ! -f ./$$f -a ! -d ./$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \

        fi; \
        fi; \

+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/$$f . ;; \
+       esac; \

        done
 
 forty_forty.o: $(srcdir)/forty.cpp
        done
 
 forty_forty.o: $(srcdir)/forty.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/forty.cpp

 
 forty_canvas.o: $(srcdir)/canvas.cpp
 
 forty_canvas.o: $(srcdir)/canvas.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/canvas.cpp

 
 forty_card.o: $(srcdir)/card.cpp
 
 forty_card.o: $(srcdir)/card.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/card.cpp

 
 forty_game.o: $(srcdir)/game.cpp
 
 forty_game.o: $(srcdir)/game.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/game.cpp

 
 forty_pile.o: $(srcdir)/pile.cpp
 
 forty_pile.o: $(srcdir)/pile.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/pile.cpp

 
 forty_playerdg.o: $(srcdir)/playerdg.cpp
 
 forty_playerdg.o: $(srcdir)/playerdg.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/playerdg.cpp

 
 forty_scoredg.o: $(srcdir)/scoredg.cpp
 
 forty_scoredg.o: $(srcdir)/scoredg.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/scoredg.cpp

 
 forty_scorefil.o: $(srcdir)/scorefil.cpp
 
 forty_scorefil.o: $(srcdir)/scorefil.cpp

-       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/scorefil.cpp

 
 forty_forty_rc.o: $(srcdir)/forty.rc
 
 forty_forty_rc.o: $(srcdir)/forty.rc

-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present: