To -> From

[wxWidgets.git] / contrib / build / fl / makefile.gcc

diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc
index 2d511f93b73747982b04f042f1556262b0893b17..88a1fe43564a85257f69f3b97889eea0b5dee965 100644 (file)
--- a/contrib/build/fl/makefile.gcc
+++ b/contrib/build/fl/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!
 # =========================================================================
 
@@ -23,10 +23,10 @@ SETUPHDIR = \
 FLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\fl\..\..\..\include \
-       -I$(SETUPHDIR) -W -Wall -I..\..\src\fl\..\..\include -DWXUSINGDLL \
-       -DWXMAKINGDLL_FL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) \
+       -I..\..\src\fl\..\..\..\include -W -Wall -I..\..\src\fl\..\..\include \
+       -DWXUSINGDLL -DWXMAKINGDLL_FL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 FLDLL_OBJECTS =  \
        $(OBJS)\fldll_dummy.o \
        $(OBJS)\fldll_version_rc.o \
@@ -50,9 +50,10 @@ FLDLL_OBJECTS =  \
 FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\fl\..\..\..\include \
-       -I$(SETUPHDIR) -W -Wall -I..\..\src\fl\..\..\include $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) \
+       -I..\..\src\fl\..\..\..\include -W -Wall -I..\..\src\fl\..\..\include \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)
 FLLIB_OBJECTS =  \
        $(OBJS)\fllib_dummy.o \
        $(OBJS)\fllib_antiflickpl.o \
@@ -276,7 +277,7 @@ $(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_version_rc.o: ../../src/fl/../../../src/msw/version.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 ../../src/fl/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG)
+       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 ../../src/fl/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG)
 
 $(OBJS)\fldll_antiflickpl.o: ../../src/fl/antiflickpl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<