Applied patch [ 795491 ] Multimon sample compatibility with various conditions

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

diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
index 063aed0e165761bc927ce1df518ca61ee4c409a7..122aebf67c8fa6d213e2a15197a5ecdd9d02c93f 100644 (file)
--- a/contrib/build/gizmos/makefile.gcc
+++ b/contrib/build/gizmos/makefile.gcc
@@ -14,11 +14,7 @@ include ../../../build/msw/config.gcc
 
 GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\gizmos\..\..\..\src\tiff -I..\..\src\gizmos\..\..\..\src\jpeg \
-       -I..\..\src\gizmos\..\..\..\src\png -I..\..\src\gizmos\..\..\..\src\zlib \
-       -I..\..\src\gizmos\..\..\..\src\regex \
-       -I..\..\src\gizmos\..\..\..\src\expat\lib \
+       $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
        $(CXXFLAGS)
 GIZMOSDLL_OBJECTS =  \
@@ -31,11 +27,7 @@ GIZMOSDLL_OBJECTS =  \
        $(OBJS)\gizmosdll_statpict.o
 GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\gizmos\..\..\..\src\tiff -I..\..\src\gizmos\..\..\..\src\jpeg \
-       -I..\..\src\gizmos\..\..\..\src\png -I..\..\src\gizmos\..\..\..\src\zlib \
-       -I..\..\src\gizmos\..\..\..\src\regex \
-       -I..\..\src\gizmos\..\..\..\src\expat\lib \
+       $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\gizmos\..\..\include $(CXXFLAGS)
 GIZMOSLIB_OBJECTS =  \
        $(OBJS)\gizmoslib_dummy.o \
@@ -45,16 +37,22 @@ GIZMOSLIB_OBJECTS =  \
        $(OBJS)\gizmoslib_multicell.o \
        $(OBJS)\gizmoslib_splittree.o \
        $(OBJS)\gizmoslib_statpict.o
-LIBDIRNAME = \
-       ..\..\src\gizmos\..\..\..\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\gizmos\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_dll$(CFG)
+endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -126,6 +124,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
@@ -149,8 +150,6 @@ __gizmoslib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.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):
@@ -160,46 +159,46 @@ $(OBJS):
 
 all: $(__gizmosdll___depname) $(__gizmoslib___depname)
 
-$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
+$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos\dynamicsash.cpp
+$(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_editlbox.o: ../../src/gizmos\editlbox.cpp
+$(OBJS)\gizmosdll_editlbox.o: ../../src/gizmos/editlbox.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_ledctrl.o: ../../src/gizmos\ledctrl.cpp
+$(OBJS)\gizmosdll_ledctrl.o: ../../src/gizmos/ledctrl.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_multicell.o: ../../src/gizmos\multicell.cpp
+$(OBJS)\gizmosdll_multicell.o: ../../src/gizmos/multicell.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_splittree.o: ../../src/gizmos\splittree.cpp
+$(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos\statpict.cpp
+$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
-$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
+$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
-$(OBJS)\gizmoslib_dynamicsash.o: ../../src/gizmos\dynamicsash.cpp
+$(OBJS)\gizmoslib_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
-$(OBJS)\gizmoslib_editlbox.o: ../../src/gizmos\editlbox.cpp
+$(OBJS)\gizmoslib_editlbox.o: ../../src/gizmos/editlbox.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
-$(OBJS)\gizmoslib_ledctrl.o: ../../src/gizmos\ledctrl.cpp
+$(OBJS)\gizmoslib_ledctrl.o: ../../src/gizmos/ledctrl.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
-$(OBJS)\gizmoslib_multicell.o: ../../src/gizmos\multicell.cpp
+$(OBJS)\gizmoslib_multicell.o: ../../src/gizmos/multicell.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
-$(OBJS)\gizmoslib_splittree.o: ../../src/gizmos\splittree.cpp
+$(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
-$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos\statpict.cpp
+$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
 clean: 
@@ -210,7 +209,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS)
-       $(CXX) -shared -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.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_BASE_p) $(__WXLIB_CORE_p)
+       $(CXX) -shared -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.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_BASE_p) $(__WXLIB_CORE_p)
 endif
 
 ifeq ($(SHARED),0)