fix those line endings in shared unicode builds

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index b1e89681fa1392f5504044678c82620e77e2db3c..cdde0658d6d090fff1333163db9bde4dbefaebb8 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -18,9 +18,10 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        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)" \
+       USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
+       USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \
+       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)" GCC_VERSION="$(GCC_VERSION)"
 
@@ -30,7 +31,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 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
+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 popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
 
 clean: 
        -if exist .\*.o del .\*.o
@@ -84,6 +85,7 @@ clean:
        $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C png -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C propsize -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
@@ -99,7 +101,6 @@ clean:
        $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C tab -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean
@@ -261,6 +262,9 @@ ownerdrw:
 png: 
        $(MAKE) -C png -f makefile.gcc $(MAKEARGS) all
 
+popup: 
+       $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all
+
 printing: 
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
 
@@ -306,9 +310,6 @@ splitter:
 statbar: 
        $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all
 
-tab: 
-       $(MAKE) -C tab -f makefile.gcc $(MAKEARGS) all
-
 taskbar: 
        $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all
 
@@ -339,4 +340,6 @@ 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 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
+.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 popup printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard
+
+