X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f55f5b81fbe7a2294912663c192113209bbc930..983736252c648598ed6bd0bd0257eff4a95b326c:/contrib/build/gizmos/makefile.gcc

diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
index faed7307c4..e65abbc7e4 100644
--- a/contrib/build/gizmos/makefile.gcc
+++ b/contrib/build/gizmos/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../../../build/config.gcc
+include ../../../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -14,13 +14,9 @@ include ../../../build/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 \
-	-I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
-	$(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
+	-Wall -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
+	$(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
 GIZMOSDLL_OBJECTS =  \
 	$(OBJS)\gizmosdll_dummy.o \
 	$(OBJS)\gizmosdll_dynamicsash.o \
@@ -31,12 +27,9 @@ 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 \
-	-I..\..\src\gizmos\..\..\include $(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
+	-Wall -I..\..\src\gizmos\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+	$(__EXCEPTIONSFLAG_0)
 GIZMOSLIB_OBJECTS =  \
 	$(OBJS)\gizmoslib_dummy.o \
 	$(OBJS)\gizmoslib_dynamicsash.o \
@@ -45,16 +38,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
@@ -108,6 +107,18 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -124,7 +135,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
@@ -142,7 +156,7 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)
 __gizmosdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
 endif
 ifeq ($(SHARED),0)
 __gizmoslib___depname = \
@@ -158,57 +172,57 @@ $(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: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
 
 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)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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)  $(__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)