Applied patch which solved conflicts between wxWidgets

[wxWidgets.git] / demos / makefile.vc

diff --git a/demos/makefile.vc b/demos/makefile.vc
index 90fb158b0e388efa03578efe154fdadc800de296..7505efeae02727d1e31cc1822ef1f1d1e2b38900 100644 (file)
--- a/demos/makefile.vc
+++ b/demos/makefile.vc
@@ -1,63 +1,86 @@
-#
-# File:         makefile.vc
-# Author:       Julian Smart
-# Created:      1993
-# Updated:
-# Copyright:    
-#
-# "%W% %G%"
-#
-# Makefile : Builds demos for Win95, MSVC++ 16-bit
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
-
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-
-THISDIR=$(WXDIR)\demos
-
-#
-# Indicates kind of pb with demos
-#
-# No makefile.vc file
-NOMAKE=1
-# No 16 bit version
-#ONLY32=1
-# Misc. compilation errors
-COMPIL=1
-# Need PNG
-PNGSETUP=
-
-!include $(WXDIR)\src\makemsc.env
-
-#
-# Please keep demos list up-to-date, in alphabetical order
-#
-all:
-        cd $(WXDIR)\demos\bombs
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\demos\dbbrowse
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\demos\forty
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\demos\fractal
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\demos\life
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\demos\poem
-        nmake -f makefile.vc FINAL=$(FINAL)
-
-clean:
-        cd $(WXDIR)\demos\bombs
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\demos\dbbrowse
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\demos\forty
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\demos\fractal
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\demos\life
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\demos\poem
-        nmake -f makefile.vc clean
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
 
+!include <../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       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_XRC="$(USE_XRC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" 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: ###
+
+
+
+### Targets: ###
+
+all: sub_bombs sub_dbbrowse sub_forty sub_fractal sub_life sub_poem
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+       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
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_forty: 
+       cd forty
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_fractal: 
+       cd fractal
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_life: 
+       cd life
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_poem: 
+       cd poem
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)