Include wx/containr.h according to precompiled headers of wx/wx.h (with other minor...

[wxWidgets.git] / samples / mobile / styles / makefile.gcc

diff --git a/samples/mobile/styles/makefile.gcc b/samples/mobile/styles/makefile.gcc
index 1c6196842b3e871fbe92851d4bcbc24ee8988153..ce4cebe9283e14d83e025f6ac3213a56cdb34bba 100644 (file)
--- a/samples/mobile/styles/makefile.gcc
+++ b/samples/mobile/styles/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (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 = 27
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -21,10 +22,10 @@ SETUPHDIR = \
 STYLES_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$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 STYLES_OBJECTS =  \
        $(OBJS)\styles_sample_rc.o \
        $(OBJS)\styles_styles.o
@@ -133,6 +134,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
@@ -197,6 +204,7 @@ all: $(OBJS)\styles.exe data
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\styles.exe del $(OBJS)\styles.exe
 
 $(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample_rc.o
@@ -207,11 +215,13 @@ data:
        for %%f in (marble.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\styles_sample_rc.o: ./../../../samples/sample.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
+       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 $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples
 
 $(OBJS)\styles_styles.o: ./styles.cpp
-       $(CXX) -c -o $@ $(STYLES_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(STYLES_CXXFLAGS) $(CPPDEPS) $<
 
 .PHONY: all clean data
 
 
+# Dependencies tracking:
+-include $(OBJS)/*.d