Applied patch [ 892511 ] wxUniversal: fix of segfault in toolbar.cpp

[wxWidgets.git] / samples / makefile.bcc

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index b496b4fe93b499322f2415995c4b1b569f95ddc3..91849ce4094ad9e308345177e077f07cfb965895 100644 (file)
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -21,15 +21,15 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
-       -DLDFLAGS="$(LDFLAGS)" -DCC="$(CC)" -DUSE_GUI="$(USE_GUI)" \
-       -DMONOLITHIC="$(MONOLITHIC)" -DCXXFLAGS="$(CXXFLAGS)" \
-       -DUSE_HTML="$(USE_HTML)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DVENDOR="$(VENDOR)" \
-       -DUNICODE="$(UNICODE)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       -DMSLU="$(MSLU)" -DWXUNIV="$(WXUNIV)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \
-       -DCXX="$(CXX)" -DCFG="$(CFG)" -DCFLAGS="$(CFLAGS)" -DSHARED="$(SHARED)" \
-       -DUSE_ODBC="$(USE_ODBC)" -DUSE_OPENGL="$(USE_OPENGL)"
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -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_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       -DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 
@@ -37,7 +37,11 @@ MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
 
 ### 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 splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest
+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 wxtest
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
 
 access: 
        cd access
@@ -64,10 +68,6 @@ checklst:
        $(MAKE) -f makefile.bcc $(MAKEARGS) all
        cd ..
 
-clean: 
-       -if exist .\*.obj del .\*.obj
-       -if exist .\*.res del .\*.res
-
 config: 
        cd config
        $(MAKE) -f makefile.bcc $(MAKEARGS) all
@@ -143,13 +143,13 @@ event:
        $(MAKE) -f makefile.bcc $(MAKEARGS) all
        cd ..
 
-except: 
-       cd except
+exec: 
+       cd exec
        $(MAKE) -f makefile.bcc $(MAKEARGS) all
        cd ..
 
-exec: 
-       cd exec
+except: 
+       cd except
        $(MAKE) -f makefile.bcc $(MAKEARGS) all
        cd ..
 
@@ -343,6 +343,11 @@ sockets:
        $(MAKE) -f makefile.bcc $(MAKEARGS) all
        cd ..
 
+sound: 
+       cd sound
+       $(MAKE) -f makefile.bcc $(MAKEARGS) all
+       cd ..
+
 splitter: 
        cd splitter
        $(MAKE) -f makefile.bcc $(MAKEARGS) all