Fix for assert in setting image from file by Jaakko Salli.

[wxWidgets.git] / demos / makefile.vc

diff --git a/demos/makefile.vc b/demos/makefile.vc
index 63bf06bea787437742a45f346e6df181e058e110..c008876b19465bfdd84fe9299a1d4a6d4aab5ffc 100644 (file)
--- a/demos/makefile.vc
+++ b/demos/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

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


@@ -12,6 +12,21 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" \
+       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -21,36 +36,56 @@
 
 all: sub_bombs sub_dbbrowse sub_forty sub_fractal sub_life sub_poem
 
 
 all: sub_bombs sub_dbbrowse sub_forty sub_fractal sub_life sub_poem
 

-sub_bombs: 
-       cd bombs
-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
-       cd $(MAKEDIR)
-

 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res

+       -if exist .\*.pch del .\*.pch
+       cd bombs
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd dbbrowse
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd forty
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd fractal
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd life
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd poem
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+
+sub_bombs: 
+       cd bombs
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)

 
 sub_dbbrowse: 
        cd dbbrowse
 
 sub_dbbrowse: 
        cd dbbrowse

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
 sub_forty: 
        cd forty
        cd $(MAKEDIR)
 
 sub_forty: 
        cd forty

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
 sub_fractal: 
        cd fractal
        cd $(MAKEDIR)
 
 sub_fractal: 
        cd fractal

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
 sub_life: 
        cd life
        cd $(MAKEDIR)
 
 sub_life: 
        cd life

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
 sub_poem: 
        cd poem
        cd $(MAKEDIR)
 
 sub_poem: 
        cd poem

-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
        cd $(MAKEDIR)

+