Allow wxPreferencesEditor::Dismiss() to work when using modal dialogs too.

[wxWidgets.git] / demos / makefile.vc

diff --git a/demos/makefile.vc b/demos/makefile.vc
index 612cb4b3e432d061da0eb8508972283ff6c02e11..2ea423c577772b446921e4b33d6539d1bde3998c 100644 (file)
--- a/demos/makefile.vc
+++ b/demos/makefile.vc
@@ -1,63 +1,85 @@
-#
-# File:                makefile.vc
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%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\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)
-        cd $(WXDIR)\demos\dbbrowse
-        nmake -f makefile.vc FINAL=$(FINAL)
-
-clean:
-        cd $(WXDIR)\demos\bombs
-        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
-        cd $(WXDIR)\demos\dbbrowse
-        nmake -f makefile.vc clean
-
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
+#     Do not modify, all changes will be overwritten!\r
+# =========================================================================\r
+\r
+!include <../build/msw/config.vc>\r
+\r
+# -------------------------------------------------------------------------\r
+# Do not modify the rest of this file!\r
+# -------------------------------------------------------------------------\r
+\r
+### Variables: ###\r
+\r
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
+       TOOLKIT="$(TOOLKIT)" TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
+       USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \\r
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
+       USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
+\r
+### Conditionally set variables: ###\r
+\r
+\r
+\r
+### Targets: ###\r
+\r
+all: sub_bombs sub_forty sub_fractal sub_life sub_poem\r
+\r
+clean: \r
+       -if exist .\*.obj del .\*.obj\r
+       -if exist .\*.res del .\*.res\r
+       -if exist .\*.pch del .\*.pch\r
+       cd bombs\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+       cd forty\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+       cd fractal\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+       cd life\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+       cd poem\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_bombs: \r
+       cd bombs\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_forty: \r
+       cd forty\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_fractal: \r
+       cd fractal\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_life: \r
+       cd life\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
+sub_poem: \r
+       cd poem\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r