Fixes for wxUSE_SPIN... == 0.

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 3370f07c2b5664a669a26b0e7ff55bb6a8b7e74c..b1e89681fa1392f5504044678c82620e77e2db3c 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -17,11 +17,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       VENDOR="$(VENDOR)" CFG="$(CFG)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-       CPPUNIT_LIBS="$(CPPUNIT_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
-       GCC_VERSION="$(GCC_VERSION)"
+       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)" GCC_VERSION="$(GCC_VERSION)"
 
 ### Conditionally set variables: ###
 
@@ -29,7 +30,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### 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 splash 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 mediaplayer 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 .\*.o del .\*.o
@@ -69,6 +70,7 @@ clean:
        $(MAKE) -C listbox -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
@@ -217,6 +219,9 @@ listctrl:
 mdi: 
        $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all
 
+mediaplayer: 
+       $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all
+
 memcheck: 
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
 
@@ -334,4 +339,4 @@ widgets:
 wizard: 
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean 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
+.PHONY: all clean 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 mediaplayer 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