Minor tweaks to bring up to date with CVS changes

[wxWidgets.git] / contrib / samples / foldbar / foldpanelbar / makefile.gcc

diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.gcc b/contrib/samples/foldbar/foldpanelbar/makefile.gcc
index d10e424c8988b083451e1aa765b40780c6be7b94..8297f138e1d6fedac49bae0743be3fa1a1a74dbf 100644 (file)
--- a/contrib/samples/foldbar/foldpanelbar/makefile.gcc
+++ b/contrib/samples/foldbar/foldpanelbar/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -13,7 +13,7 @@ include ../../../../build/msw/config.gcc
 ### Variables: ###
 
 CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 27
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -23,7 +23,7 @@ FOLDTEST_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) $(__MSLU_DEFINE_p) \
-       -I.\..\..\..\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) \
+       -I$(SETUPHDIR) -I.\..\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) \
        -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include $(__RTTIFLAG_5) \
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 FOLDTEST_OBJECTS =  \
@@ -226,7 +226,7 @@ $(OBJS)\foldtest_test.o: ./test.cpp
        $(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\foldtest_foldpanelbartest_rc.o: ./foldpanelbartest.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) $(__MSLU_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include
+       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 --define NOPCH --include-dir ./../../../include
 
 .PHONY: all clean