fix for [ 1020924 ] wx.Display.IsPrimary is wrong

[wxWidgets.git] / samples / makefile.bcc

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 0f4cf91ec0ddb3df940f1f8faeb3cbfbf2ec2ce6..b2c908b9216b570029f720dc1288e7a56001e802 100644 (file)
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -26,11 +26,13 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" \
        -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
        -DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \
-       -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \
+       -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
        -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" \
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       -DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+       -DVENDOR="$(VENDOR)" -DWX_FLAVOUR="$(WX_FLAVOUR)" \
+       -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" -DCFG="$(CFG)" \
+       -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 
@@ -38,7 +40,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
 
 clean: 
        -if exist .\*.obj del .\*.obj
@@ -287,6 +289,10 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sound.bat
        call sound.bat
        @del sound.bat
+       @echo cd splash >splash.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splash.bat
+       call splash.bat
+       @del splash.bat
        @echo cd splitter >splitter.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splitter.bat
        call splitter.bat
@@ -706,6 +712,12 @@ sound:
        call sound.bat
        @del sound.bat
 
+splash: 
+       @echo cd splash >splash.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat
+       call splash.bat
+       @del splash.bat
+
 splitter: 
        @echo cd splitter >splitter.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splitter.bat