Applied patch [ 795491 ] Multimon sample compatibility with various conditions

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

diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc
index 7193ec984482ba734be111884e6637a356a9a267..f71b869ae3380439015d13a7531b6fe1d6ffb9c4 100644 (file)
--- a/contrib/build/fl/makefile.gcc
+++ b/contrib/build/fl/makefile.gcc
@@ -14,10 +14,7 @@ include ../../../build/msw/config.gcc
 
 FLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg \
-       -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib \
-       -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\..\src\expat\lib \
+       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS)
 FLDLL_OBJECTS =  \
        $(OBJS)\fldll_dummy.o \
@@ -40,10 +37,7 @@ FLDLL_OBJECTS =  \
        $(OBJS)\fldll_updatesmgr.o
 FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg \
-       -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib \
-       -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\..\src\expat\lib \
+       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\fl\..\..\include $(CXXFLAGS)
 FLLIB_OBJECTS =  \
        $(OBJS)\fllib_dummy.o \
@@ -64,16 +58,22 @@ FLLIB_OBJECTS =  \
        $(OBJS)\fllib_rowlayoutpl.o \
        $(OBJS)\fllib_toolwnd.o \
        $(OBJS)\fllib_updatesmgr.o
-LIBDIRNAME = \
-       ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_dll$(CFG)
+endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -145,6 +145,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
@@ -168,8 +171,6 @@ __fllib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
 endif
 
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-
 
 all: $(OBJS)
 $(OBJS):
@@ -179,112 +180,112 @@ $(OBJS):
 
 all: $(__fldll___depname) $(__fllib___depname)
 
-$(OBJS)\fldll_antiflickpl.o: ../../src/fl\antiflickpl.cpp
+$(OBJS)\fldll_antiflickpl.o: ../../src/fl/antiflickpl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_bardragpl.o: ../../src/fl\bardragpl.cpp
+$(OBJS)\fldll_bardragpl.o: ../../src/fl/bardragpl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_barhintspl.o: ../../src/fl\barhintspl.cpp
+$(OBJS)\fldll_barhintspl.o: ../../src/fl/barhintspl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_cbcustom.o: ../../src/fl\cbcustom.cpp
+$(OBJS)\fldll_cbcustom.o: ../../src/fl/cbcustom.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_controlbar.o: ../../src/fl\controlbar.cpp
+$(OBJS)\fldll_controlbar.o: ../../src/fl/controlbar.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_dummy.o: ../../src/fl\..\..\..\src\msw\dummy.cpp
+$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_dyntbar.o: ../../src/fl\dyntbar.cpp
+$(OBJS)\fldll_dyntbar.o: ../../src/fl/dyntbar.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_dyntbarhnd.o: ../../src/fl\dyntbarhnd.cpp
+$(OBJS)\fldll_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_frmview.o: ../../src/fl\frmview.cpp
+$(OBJS)\fldll_frmview.o: ../../src/fl/frmview.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_garbagec.o: ../../src/fl\garbagec.cpp
+$(OBJS)\fldll_garbagec.o: ../../src/fl/garbagec.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_gcupdatesmgr.o: ../../src/fl\gcupdatesmgr.cpp
+$(OBJS)\fldll_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_hintanimpl.o: ../../src/fl\hintanimpl.cpp
+$(OBJS)\fldll_hintanimpl.o: ../../src/fl/hintanimpl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_newbmpbtn.o: ../../src/fl\newbmpbtn.cpp
+$(OBJS)\fldll_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_panedrawpl.o: ../../src/fl\panedrawpl.cpp
+$(OBJS)\fldll_panedrawpl.o: ../../src/fl/panedrawpl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_rowdragpl.o: ../../src/fl\rowdragpl.cpp
+$(OBJS)\fldll_rowdragpl.o: ../../src/fl/rowdragpl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_rowlayoutpl.o: ../../src/fl\rowlayoutpl.cpp
+$(OBJS)\fldll_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_toolwnd.o: ../../src/fl\toolwnd.cpp
+$(OBJS)\fldll_toolwnd.o: ../../src/fl/toolwnd.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fldll_updatesmgr.o: ../../src/fl\updatesmgr.cpp
+$(OBJS)\fldll_updatesmgr.o: ../../src/fl/updatesmgr.cpp
        $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
 
-$(OBJS)\fllib_antiflickpl.o: ../../src/fl\antiflickpl.cpp
+$(OBJS)\fllib_antiflickpl.o: ../../src/fl/antiflickpl.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_bardragpl.o: ../../src/fl\bardragpl.cpp
+$(OBJS)\fllib_bardragpl.o: ../../src/fl/bardragpl.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_barhintspl.o: ../../src/fl\barhintspl.cpp
+$(OBJS)\fllib_barhintspl.o: ../../src/fl/barhintspl.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_cbcustom.o: ../../src/fl\cbcustom.cpp
+$(OBJS)\fllib_cbcustom.o: ../../src/fl/cbcustom.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_controlbar.o: ../../src/fl\controlbar.cpp
+$(OBJS)\fllib_controlbar.o: ../../src/fl/controlbar.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_dummy.o: ../../src/fl\..\..\..\src\msw\dummy.cpp
+$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_dyntbar.o: ../../src/fl\dyntbar.cpp
+$(OBJS)\fllib_dyntbar.o: ../../src/fl/dyntbar.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_dyntbarhnd.o: ../../src/fl\dyntbarhnd.cpp
+$(OBJS)\fllib_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_frmview.o: ../../src/fl\frmview.cpp
+$(OBJS)\fllib_frmview.o: ../../src/fl/frmview.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_garbagec.o: ../../src/fl\garbagec.cpp
+$(OBJS)\fllib_garbagec.o: ../../src/fl/garbagec.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_gcupdatesmgr.o: ../../src/fl\gcupdatesmgr.cpp
+$(OBJS)\fllib_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_hintanimpl.o: ../../src/fl\hintanimpl.cpp
+$(OBJS)\fllib_hintanimpl.o: ../../src/fl/hintanimpl.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_newbmpbtn.o: ../../src/fl\newbmpbtn.cpp
+$(OBJS)\fllib_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_panedrawpl.o: ../../src/fl\panedrawpl.cpp
+$(OBJS)\fllib_panedrawpl.o: ../../src/fl/panedrawpl.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_rowdragpl.o: ../../src/fl\rowdragpl.cpp
+$(OBJS)\fllib_rowdragpl.o: ../../src/fl/rowdragpl.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_rowlayoutpl.o: ../../src/fl\rowlayoutpl.cpp
+$(OBJS)\fllib_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_toolwnd.o: ../../src/fl\toolwnd.cpp
+$(OBJS)\fllib_toolwnd.o: ../../src/fl/toolwnd.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
-$(OBJS)\fllib_updatesmgr.o: ../../src/fl\updatesmgr.cpp
+$(OBJS)\fllib_updatesmgr.o: ../../src/fl/updatesmgr.cpp
        $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
 
 clean: 
@@ -295,7 +296,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS)
-       $(CXX) -shared -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)