wxMediaCtrl patch from Ryan:

[wxWidgets.git] / demos / dbbrowse / makefile.gcc

diff --git a/demos/dbbrowse/makefile.gcc b/demos/dbbrowse/makefile.gcc
index c6d5599021aa359c836c9dfb5bbff20853438756..842b06585cf2855d81746a85e44afadd9332d6d1 100644 (file)
--- a/demos/dbbrowse/makefile.gcc
+++ b/demos/dbbrowse/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,7 +12,8 @@ include ../../build/msw/config.gcc
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 26
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -21,9 +22,10 @@ SETUPHDIR = \
 DBBROWSE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-       -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       -I.\..\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
 DBBROWSE_OBJECTS =  \
        $(OBJS)\dbbrowse_dbbrowse.o \
        $(OBJS)\dbbrowse_doc.o \
@@ -142,6 +144,12 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define _UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
@@ -224,6 +232,7 @@ all: $(__dbbrowse___depname) data_help_std data_help_png
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\dbbrowse.exe del $(OBJS)\dbbrowse.exe
 
 ifeq ($(USE_ODBC),1)
@@ -240,32 +249,34 @@ data_help_png:
        for %%f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%%f copy .\help.png\%%f $(OBJS)\help.png
 
 $(OBJS)\dbbrowse_dbbrowse.o: ./dbbrowse.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_doc.o: ./doc.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_pgmctrl.o: ./pgmctrl.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_tabpgwin.o: ./tabpgwin.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_browsedb.o: ./browsedb.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_dbtree.o: ./dbtree.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_dbgrid.o: ./dbgrid.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_dlguser.o: ./dlguser.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\dbbrowse_dbbrowse_rc.o: ./dbbrowse.rc
-       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
 
 .PHONY: all clean data_help_std data_help_png
 
 
+# Dependencies tracking:
+-include $(OBJS)/*.d