X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/102d46f3d675b404bc15d8c540e27f770f800945..8b5895b0fe39f806ee35ff643b3c9c2904a8ef4f:/contrib/build/gizmos/makefile.gcc?ds=sidebyside diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc index 7822196734..3b4103de88 100644 --- a/contrib/build/gizmos/makefile.gcc +++ b/contrib/build/gizmos/makefile.gcc @@ -12,8 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -WX_RELEASE_NODOT = 25 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5 +WX_RELEASE_NODOT = 26 OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) @@ -36,6 +35,18 @@ GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_multicell.o \ $(OBJS)\gizmosdll_splittree.o \ $(OBJS)\gizmosdll_statpict.o +GIZMOS_XRCDLL_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) \ + -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS_XRC \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) +GIZMOS_XRCDLL_OBJECTS = \ + $(OBJS)\gizmos_xrcdll_dummy.o \ + $(OBJS)\gizmos_xrcdll_version_rc.o \ + $(OBJS)\gizmos_xrcdll_xh_statpict.o GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -51,6 +62,16 @@ GIZMOSLIB_OBJECTS = \ $(OBJS)\gizmoslib_multicell.o \ $(OBJS)\gizmoslib_splittree.o \ $(OBJS)\gizmoslib_statpict.o +GIZMOS_XRCLIB_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) \ + -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\gizmos\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +GIZMOS_XRCLIB_OBJECTS = \ + $(OBJS)\gizmos_xrclib_dummy.o \ + $(OBJS)\gizmos_xrclib_xh_statpict.o ### Conditionally set variables: ### @@ -100,30 +121,50 @@ EXTRALIBS_FOR_BASE = endif ifeq ($(SHARED),1) __gizmosdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),1) +ifeq ($(USE_XRC),1) +__gizmos_xrcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll +endif +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_XRC_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc +endif +ifeq ($(SHARED),0) +__gizmoslib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a +endif +ifeq ($(SHARED),0) +ifeq ($(USE_XRC),1) +__gizmos_xrclib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a +endif endif ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ endif ifeq ($(BUILD),debug) ifeq ($(DEBUG_FLAG),default) -__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +__DEBUG_DEFINE_p_0 = --define __WXDEBUG__ endif endif ifeq ($(DEBUG_FLAG),1) -__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +__DEBUG_DEFINE_p_0 = --define __WXDEBUG__ endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS endif ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI +__RTTI_DEFINE_p_0 = --define wxNO_RTTI endif ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS +__THREAD_DEFINE_p_0 = --define wxNO_THREADS endif ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE +__UNICODE_DEFINE_p_0 = --define _UNICODE endif ifeq ($(MONOLITHIC),1) __WXLIB_MONO_p = \ @@ -142,16 +183,12 @@ ifeq ($(MSLU),1) __UNICOWS_LIB_p = -lunicows endif ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),0) __WXLIB_CORE_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core endif -ifeq ($(SHARED),0) -__gizmoslib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(BUILD),debug) ifeq ($(DEBUG_INFO),default) @@ -224,17 +261,27 @@ $(OBJS): ### Targets: ### -all: $(__gizmosdll___depname) $(__gizmoslib___depname) +all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname) clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a + +ifeq ($(SHARED),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version_rc.o + $(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif ifeq ($(SHARED),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) +ifeq ($(USE_XRC),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll: $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version_rc.o $(__gizmosdll___depname) + $(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif endif ifeq ($(SHARED),0) @@ -244,11 +291,20 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$( ranlib $@ endif +ifeq ($(SHARED),0) +ifeq ($(USE_XRC),1) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a: $(GIZMOS_XRCLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(GIZMOS_XRCLIB_OBJECTS) + ranlib $@ +endif +endif + $(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< $(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/../../../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) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG) + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG) $(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< @@ -268,6 +324,15 @@ $(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp $(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< +$(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $< + +$(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG) + +$(OBJS)\gizmos_xrcdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp + $(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $< + $(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< @@ -289,6 +354,12 @@ $(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp $(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< +$(OBJS)\gizmos_xrclib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $< + +$(OBJS)\gizmos_xrclib_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp + $(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $< + .PHONY: all clean