From 3f55f5b81fbe7a2294912663c192113209bbc930 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 1 Aug 2003 16:05:28 +0000 Subject: [PATCH] regenerated after adding DEBUG_ options git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/build/animate/makefile.bcc | 73 +++++--- contrib/build/animate/makefile.gcc | 93 ++++++++-- contrib/build/animate/makefile.vc | 180 ++++++++++++++---- contrib/build/animate/makefile.wat | 121 +++++++++--- contrib/build/fl/makefile.bcc | 105 ++++++++--- contrib/build/fl/makefile.gcc | 118 ++++++++++-- contrib/build/fl/makefile.vc | 205 ++++++++++++++++---- contrib/build/fl/makefile.wat | 146 ++++++++++++--- contrib/build/gizmos/makefile.bcc | 83 ++++++--- contrib/build/gizmos/makefile.gcc | 99 ++++++++-- contrib/build/gizmos/makefile.vc | 186 +++++++++++++++---- contrib/build/gizmos/makefile.wat | 131 ++++++++++--- contrib/build/ogl/makefile.bcc | 99 +++++++--- contrib/build/ogl/makefile.gcc | 108 +++++++++-- contrib/build/ogl/makefile.vc | 195 +++++++++++++++---- contrib/build/ogl/makefile.wat | 137 +++++++++++--- contrib/build/stc/makefile.bcc | 167 ++++++++++++++--- contrib/build/stc/makefile.gcc | 183 ++++++++++++++++-- contrib/build/stc/makefile.vc | 268 +++++++++++++++++++++++---- contrib/build/stc/makefile.wat | 211 ++++++++++++++++++--- contrib/build/svg/makefile.bcc | 30 ++- contrib/build/svg/makefile.gcc | 36 ++-- contrib/build/svg/makefile.vc | 141 ++++++++++---- contrib/build/svg/makefile.wat | 48 ++++- contrib/build/xrc/makefile.bcc | 145 ++++++++++++--- contrib/build/xrc/makefile.gcc | 162 ++++++++++++++-- contrib/build/xrc/makefile.vc | 249 +++++++++++++++++++++---- contrib/build/xrc/makefile.wat | 191 ++++++++++++++++--- contrib/samples/animate/Makefile.in | 52 +++--- contrib/samples/animate/makefile.bcc | 52 ++++-- contrib/samples/animate/makefile.gcc | 57 +++++- contrib/samples/animate/makefile.vc | 120 +++++++++--- contrib/samples/animate/makefile.wat | 82 ++++++-- contrib/samples/svg/Makefile.in | 3 +- contrib/samples/svg/makefile.bcc | 28 ++- contrib/samples/svg/makefile.gcc | 32 +++- contrib/samples/svg/makefile.vc | 90 ++++++--- contrib/samples/svg/makefile.wat | 46 ++++- contrib/samples/xrc/Makefile.in | 63 ++++--- contrib/samples/xrc/makefile.bcc | 65 +++++-- contrib/samples/xrc/makefile.gcc | 74 +++++++- contrib/samples/xrc/makefile.vc | 168 +++++++++++++---- contrib/samples/xrc/makefile.wat | 94 ++++++++-- contrib/src/animate/Makefile.in | 130 +++++++------ contrib/src/fl/Makefile.in | 160 ++++++++++------ contrib/src/gizmos/Makefile.in | 139 ++++++++------ contrib/src/ogl/Makefile.in | 154 +++++++++------ contrib/src/stc/Makefile.in | 224 ++++++++++++++++------ contrib/src/svg/Makefile.in | 3 +- contrib/src/xrc/Makefile.in | 205 ++++++++++++++------ contrib/utils/wxrc/Makefile.in | 34 ++-- contrib/utils/wxrc/makefile.bcc | 52 ++++-- contrib/utils/wxrc/makefile.gcc | 54 +++++- contrib/utils/wxrc/makefile.vc | 117 +++++++++--- contrib/utils/wxrc/makefile.wat | 79 ++++++-- samples/svg/Makefile.in | 3 +- samples/svg/makefile.bcc | 28 ++- samples/svg/makefile.gcc | 32 +++- samples/svg/makefile.vc | 90 ++++++--- samples/svg/makefile.wat | 46 ++++- samples/xrc/Makefile.in | 63 ++++--- samples/xrc/makefile.bcc | 65 +++++-- samples/xrc/makefile.gcc | 74 +++++++- samples/xrc/makefile.vc | 168 +++++++++++++---- samples/xrc/makefile.wat | 94 ++++++++-- src/stc/Makefile.in | 224 ++++++++++++++++------ src/xrc/Makefile.in | 205 ++++++++++++++------ utils/wxrc/Makefile.in | 34 ++-- utils/wxrc/makefile.bcc | 52 ++++-- utils/wxrc/makefile.gcc | 54 +++++- utils/wxrc/makefile.vc | 117 +++++++++--- utils/wxrc/makefile.wat | 79 ++++++-- 72 files changed, 6096 insertions(+), 1619 deletions(-) diff --git a/contrib/build/animate/makefile.bcc b/contrib/build/animate/makefile.bcc index 7a25f8e821..1ffe60afae 100644 --- a/contrib/build/animate/makefile.bcc +++ b/contrib/build/animate/makefile.bcc @@ -20,10 +20,9 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include \ - -I..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\animate\..\..\..\src\tiff \ -I..\..\src\animate\..\..\..\src\jpeg \ -I..\..\src\animate\..\..\..\src\png \ @@ -32,10 +31,12 @@ ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ -I..\..\src\animate\..\..\..\src\expat\lib \ -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \ $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_animatedll.csm -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +ANIMATEDLL_OBJECTS = \ + $(OBJS)\animatedll_dummy.obj \ + $(OBJS)\animatedll_animate.obj +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include \ - -I..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\animate\..\..\..\src\tiff \ -I..\..\src\animate\..\..\..\src\jpeg \ -I..\..\src\animate\..\..\..\src\png \ @@ -44,6 +45,11 @@ ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ -I..\..\src\animate\..\..\..\src\expat\lib \ -I..\..\src\animate\..\..\include $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_animatelib.csm +ANIMATELIB_OBJECTS = \ + $(OBJS)\animatelib_dummy.obj \ + $(OBJS)\animatelib_animate.obj +LIBDIRNAME = \ + ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -61,7 +67,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -73,15 +82,33 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -119,11 +146,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(SHARED)" == "1" __animatedll___depname = \ - ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" __animatelib___depname = \ - ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib !endif @@ -148,24 +175,24 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp $(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $** !if "$(SHARED)" == "1" -..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| - c0d32.obj $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | - implib -f ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@ !endif !if "$(SHARED)" == "0" -..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(ANIMATELIB_OBJECTS) $(OBJS)\animatelib_dummy.obj if exist $@ del $@ tlib /a /p2048 $@ @&&| - $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj + $(ANIMATELIB_OBJECTS) | !endif clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll - -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib - -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib diff --git a/contrib/build/animate/makefile.gcc b/contrib/build/animate/makefile.gcc index c56f9fd249..1b13eb37da 100644 --- a/contrib/build/animate/makefile.gcc +++ b/contrib/build/animate/makefile.gcc @@ -12,9 +12,37 @@ include ../../../build/config.gcc ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\animate\..\..\..\src\tiff -I..\..\src\animate\..\..\..\src\jpeg -I..\..\src\animate\..\..\..\src\png -I..\..\src\animate\..\..\..\src\zlib -I..\..\src\animate\..\..\..\src\regex -I..\..\src\animate\..\..\..\src\expat\lib -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\animate\..\..\..\src\tiff -I..\..\src\animate\..\..\..\src\jpeg -I..\..\src\animate\..\..\..\src\png -I..\..\src\animate\..\..\..\src\zlib -I..\..\src\animate\..\..\..\src\regex -I..\..\src\animate\..\..\..\src\expat\lib -I..\..\src\animate\..\..\include $(CXXFLAGS) -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\animate\..\..\..\src\tiff \ + -I..\..\src\animate\..\..\..\src\jpeg \ + -I..\..\src\animate\..\..\..\src\png \ + -I..\..\src\animate\..\..\..\src\zlib \ + -I..\..\src\animate\..\..\..\src\regex \ + -I..\..\src\animate\..\..\..\src\expat\lib \ + -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \ + $(CXXFLAGS) +ANIMATEDLL_OBJECTS = \ + $(OBJS)\animatedll_dummy.o \ + $(OBJS)\animatedll_animate.o +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\animate\..\..\..\src\tiff \ + -I..\..\src\animate\..\..\..\src\jpeg \ + -I..\..\src\animate\..\..\..\src\png \ + -I..\..\src\animate\..\..\..\src\zlib \ + -I..\..\src\animate\..\..\..\src\regex \ + -I..\..\src\animate\..\..\..\src\expat\lib \ + -I..\..\src\animate\..\..\include $(CXXFLAGS) +ANIMATELIB_OBJECTS = \ + $(OBJS)\animatelib_dummy.o \ + $(OBJS)\animatelib_animate.o +LIBDIRNAME = \ + ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -34,6 +62,11 @@ ifeq ($(OFFICIAL_BUILD),1) VENDORTAG = endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -46,14 +79,38 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif @@ -67,19 +124,23 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(SHARED),1) -__animatedll___depname = ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll +__animatedll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll endif ifeq ($(SHARED),0) -__animatelib___depname = ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a +__animatelib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a endif @@ -104,21 +165,21 @@ $(OBJS)\animatelib_dummy.o: ../../src/animate\..\..\..\src\msw\dummy.cpp $(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $< ifeq ($(SHARED),1) -..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.o $(OBJS)\animatedll_animate.o - $(CXX) -shared -o $@ $(OBJS)\animatedll_dummy.o $(OBJS)\animatedll_animate.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -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) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) + $(CXX) -shared -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.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) endif ifeq ($(SHARED),0) -..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a: $(OBJS)\animatelib_dummy.o $(OBJS)\animatelib_animate.o +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a: $(ANIMATELIB_OBJECTS) if exist $@ del $@ - ar rcu $@ $(OBJS)\animatelib_dummy.o $(OBJS)\animatelib_animate.o + ar rcu $@ $(ANIMATELIB_OBJECTS) ranlib $@ endif clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll - -if exist ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a - -if exist ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a .PHONY: all clean diff --git a/contrib/build/animate/makefile.vc b/contrib/build/animate/makefile.vc index 39df0f055e..a3fe0249ae 100644 --- a/contrib/build/animate/makefile.vc +++ b/contrib/build/animate/makefile.vc @@ -12,9 +12,44 @@ ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\animate\..\..\..\include /I..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\animate\..\..\..\src\tiff /I..\..\src\animate\..\..\..\src\jpeg /I..\..\src\animate\..\..\..\src\png /I..\..\src\animate\..\..\..\src\zlib /I..\..\src\animate\..\..\..\src\regex /I..\..\src\animate\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_animatedll.pch /I..\..\src\animate\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_ANIMATE $(CXXFLAGS) /Yuwx/wxprec.h -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\animate\..\..\..\include /I..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\animate\..\..\..\src\tiff /I..\..\src\animate\..\..\..\src\jpeg /I..\..\src\animate\..\..\..\src\png /I..\..\src\animate\..\..\..\src\zlib /I..\..\src\animate\..\..\..\src\regex /I..\..\src\animate\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_animatelib.pch /I..\..\src\animate\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\animate\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\animate\..\..\..\src\tiff \ + /I..\..\src\animate\..\..\..\src\jpeg \ + /I..\..\src\animate\..\..\..\src\png \ + /I..\..\src\animate\..\..\..\src\zlib \ + /I..\..\src\animate\..\..\..\src\regex \ + /I..\..\src\animate\..\..\..\src\expat\lib \ + /I..\..\src\animate\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_ANIMATE \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_animatedll.pch" +ANIMATEDLL_OBJECTS = \ + $(OBJS)\animatedll_dummy.obj \ + $(OBJS)\animatedll_animate.obj +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\animate\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\animate\..\..\..\src\tiff \ + /I..\..\src\animate\..\..\..\src\jpeg \ + /I..\..\src\animate\..\..\..\src\png \ + /I..\..\src\animate\..\..\..\src\zlib \ + /I..\..\src\animate\..\..\..\src\regex \ + /I..\..\src\animate\..\..\..\src\expat\lib \ + /I..\..\src\animate\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_animatelib.pch" +ANIMATELIB_OBJECTS = \ + $(OBJS)\animatelib_dummy.obj \ + $(OBJS)\animatelib_animate.obj +LIBDIRNAME = \ + ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -30,7 +65,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -42,27 +80,75 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -82,25 +168,53 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" -__animatedll___depname = ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll +__animatedll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" -__animatelib___depname = ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +__animatelib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib !endif @@ -125,23 +239,23 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) /Ycwx/wxprec.h $** !if "$(SHARED)" == "1" -..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(ANIMATEDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib << !endif !if "$(SHARED)" == "0" -..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(ANIMATELIB_OBJECTS) $(OBJS)\animatelib_dummy.obj if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< - $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj + $(ANIMATELIB_OBJECTS) << !endif clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll - -if exist ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib - -if exist ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib diff --git a/contrib/build/animate/makefile.wat b/contrib/build/animate/makefile.wat index b203ce74de..f82b183b17 100644 --- a/contrib/build/animate/makefile.wat +++ b/contrib/build/animate/makefile.wat @@ -43,6 +43,11 @@ VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -57,24 +62,61 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG = +__DEBUGINFO = !ifeq BUILD debug -__DEBUGFLAG = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG = !ifeq BUILD debug __OPTIMIZEFLAG = -od @@ -99,11 +141,13 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -111,18 +155,49 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ !endif __animatedll___depname = !ifeq SHARED 1 -__animatedll___depname = ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll +__animatedll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll !endif __animatelib___depname = !ifeq SHARED 0 -__animatelib___depname = ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +__animatelib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib !endif ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include -i=..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\animate\..\..\..\src\tiff -i=..\..\src\animate\..\..\..\src\jpeg -i=..\..\src\animate\..\..\..\src\png -i=..\..\src\animate\..\..\..\src\zlib -i=..\..\src\animate\..\..\..\src\regex -i=..\..\src\animate\..\..\..\src\expat\lib -i=..\..\src\animate\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_ANIMATE $(CXXFLAGS) /fh=$(OBJS)\wxprec_animatedll.pch -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include -i=..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\animate\..\..\..\src\tiff -i=..\..\src\animate\..\..\..\src\jpeg -i=..\..\src\animate\..\..\..\src\png -i=..\..\src\animate\..\..\..\src\zlib -i=..\..\src\animate\..\..\..\src\regex -i=..\..\src\animate\..\..\..\src\expat\lib -i=..\..\src\animate\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_animatelib.pch -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\animate\..\..\..\src\tiff & + -i=..\..\src\animate\..\..\..\src\jpeg & + -i=..\..\src\animate\..\..\..\src\png & + -i=..\..\src\animate\..\..\..\src\zlib & + -i=..\..\src\animate\..\..\..\src\regex & + -i=..\..\src\animate\..\..\..\src\expat\lib & + -i=..\..\src\animate\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_ANIMATE & + $(CXXFLAGS) /fh=$(OBJS)\wxprec_animatedll.pch +ANIMATEDLL_OBJECTS = & + $(OBJS)\animatedll_dummy.obj & + $(OBJS)\animatedll_animate.obj +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\animate\..\..\..\src\tiff & + -i=..\..\src\animate\..\..\..\src\jpeg & + -i=..\..\src\animate\..\..\..\src\png & + -i=..\..\src\animate\..\..\..\src\zlib & + -i=..\..\src\animate\..\..\..\src\regex & + -i=..\..\src\animate\..\..\..\src\expat\lib & + -i=..\..\src\animate\..\..\include $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_animatelib.pch +ANIMATELIB_OBJECTS = & + $(OBJS)\animatelib_dummy.obj & + $(OBJS)\animatelib_animate.obj +LIBDIRNAME = & + ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -147,24 +222,24 @@ $(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\d $(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $< !ifeq SHARED 1 -..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll : $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll : $(ANIMATEDLL_OBJECTS) @%create $(OBJS)\animatedll.lbc @%append $(OBJS)\animatedll.lbc option quiet @%append $(OBJS)\animatedll.lbc name $^@ @%append $(OBJS)\animatedll.lbc option incremental - @%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - @for %i in ( $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj) do @%append $(OBJS)\animatedll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\animatedll.lbc library %i + @%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\animatedll.lbc library %i @%append $(OBJS)\animatedll.lbc @%append $(OBJS)\animatedll.lbc system nt_dll wlink @$(OBJS)\animatedll.lbc - wlib -q -n -b ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +$^@ + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +$^@ !endif !ifeq SHARED 0 -..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib : $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib : $(ANIMATELIB_OBJECTS) @%create $(OBJS)\animatelib.lbc - @for %i in ( $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj) do @%append $(OBJS)\animatelib.lbc +%i + @for %i in ($(ANIMATELIB_OBJECTS)) do @%append $(OBJS)\animatelib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\animatelib.lbc !endif @@ -173,6 +248,6 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll - -if exist ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib - -if exist ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc index c6efc4bb9d..19fd410964 100644 --- a/contrib/build/fl/makefile.bcc +++ b/contrib/build/fl/makefile.bcc @@ -20,23 +20,61 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ +FLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \ - -I..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__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 \ -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_fldll.csm -FLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ +FLDLL_OBJECTS = \ + $(OBJS)\fldll_dummy.obj \ + $(OBJS)\fldll_antiflickpl.obj \ + $(OBJS)\fldll_bardragpl.obj \ + $(OBJS)\fldll_barhintspl.obj \ + $(OBJS)\fldll_cbcustom.obj \ + $(OBJS)\fldll_controlbar.obj \ + $(OBJS)\fldll_dyntbar.obj \ + $(OBJS)\fldll_dyntbarhnd.obj \ + $(OBJS)\fldll_frmview.obj \ + $(OBJS)\fldll_garbagec.obj \ + $(OBJS)\fldll_gcupdatesmgr.obj \ + $(OBJS)\fldll_hintanimpl.obj \ + $(OBJS)\fldll_newbmpbtn.obj \ + $(OBJS)\fldll_panedrawpl.obj \ + $(OBJS)\fldll_rowdragpl.obj \ + $(OBJS)\fldll_rowlayoutpl.obj \ + $(OBJS)\fldll_toolwnd.obj \ + $(OBJS)\fldll_updatesmgr.obj +FLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \ - -I..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__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 \ -I..\..\src\fl\..\..\include $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fllib.csm +FLLIB_OBJECTS = \ + $(OBJS)\fllib_dummy.obj \ + $(OBJS)\fllib_antiflickpl.obj \ + $(OBJS)\fllib_bardragpl.obj \ + $(OBJS)\fllib_barhintspl.obj \ + $(OBJS)\fllib_cbcustom.obj \ + $(OBJS)\fllib_controlbar.obj \ + $(OBJS)\fllib_dyntbar.obj \ + $(OBJS)\fllib_dyntbarhnd.obj \ + $(OBJS)\fllib_frmview.obj \ + $(OBJS)\fllib_garbagec.obj \ + $(OBJS)\fllib_gcupdatesmgr.obj \ + $(OBJS)\fllib_hintanimpl.obj \ + $(OBJS)\fllib_newbmpbtn.obj \ + $(OBJS)\fllib_panedrawpl.obj \ + $(OBJS)\fllib_rowdragpl.obj \ + $(OBJS)\fllib_rowlayoutpl.obj \ + $(OBJS)\fllib_toolwnd.obj \ + $(OBJS)\fllib_updatesmgr.obj +LIBDIRNAME = \ + ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -54,7 +92,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -66,15 +107,33 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -112,11 +171,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(SHARED)" == "1" __fldll___depname = \ - ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" __fllib___depname = \ - ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib !endif @@ -239,22 +298,22 @@ $(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll - -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib - -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib !if "$(SHARED)" == "1" -..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| - c0d32.obj $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(FLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | - implib -f ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@ !endif !if "$(SHARED)" == "0" -..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(FLLIB_OBJECTS) $(OBJS)\fllib_dummy.obj if exist $@ del $@ tlib /a /p2048 $@ @&&| - $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj + $(FLLIB_OBJECTS) | !endif diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc index 3a8d329872..9f1d4a12bd 100644 --- a/contrib/build/fl/makefile.gcc +++ b/contrib/build/fl/makefile.gcc @@ -12,9 +12,62 @@ include ../../../build/config.gcc ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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 -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) -FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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 -I..\..\src\fl\..\..\include $(CXXFLAGS) -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +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 \ + -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) +FLDLL_OBJECTS = \ + $(OBJS)\fldll_dummy.o \ + $(OBJS)\fldll_antiflickpl.o \ + $(OBJS)\fldll_bardragpl.o \ + $(OBJS)\fldll_barhintspl.o \ + $(OBJS)\fldll_cbcustom.o \ + $(OBJS)\fldll_controlbar.o \ + $(OBJS)\fldll_dyntbar.o \ + $(OBJS)\fldll_dyntbarhnd.o \ + $(OBJS)\fldll_frmview.o \ + $(OBJS)\fldll_garbagec.o \ + $(OBJS)\fldll_gcupdatesmgr.o \ + $(OBJS)\fldll_hintanimpl.o \ + $(OBJS)\fldll_newbmpbtn.o \ + $(OBJS)\fldll_panedrawpl.o \ + $(OBJS)\fldll_rowdragpl.o \ + $(OBJS)\fldll_rowlayoutpl.o \ + $(OBJS)\fldll_toolwnd.o \ + $(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 \ + -I..\..\src\fl\..\..\include $(CXXFLAGS) +FLLIB_OBJECTS = \ + $(OBJS)\fllib_dummy.o \ + $(OBJS)\fllib_antiflickpl.o \ + $(OBJS)\fllib_bardragpl.o \ + $(OBJS)\fllib_barhintspl.o \ + $(OBJS)\fllib_cbcustom.o \ + $(OBJS)\fllib_controlbar.o \ + $(OBJS)\fllib_dyntbar.o \ + $(OBJS)\fllib_dyntbarhnd.o \ + $(OBJS)\fllib_frmview.o \ + $(OBJS)\fllib_garbagec.o \ + $(OBJS)\fllib_gcupdatesmgr.o \ + $(OBJS)\fllib_hintanimpl.o \ + $(OBJS)\fllib_newbmpbtn.o \ + $(OBJS)\fllib_panedrawpl.o \ + $(OBJS)\fllib_rowdragpl.o \ + $(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) ### Conditionally set variables: ### @@ -34,6 +87,11 @@ ifeq ($(OFFICIAL_BUILD),1) VENDORTAG = endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -46,14 +104,38 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif @@ -67,19 +149,23 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(SHARED),1) -__fldll___depname = ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll +__fldll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll endif ifeq ($(SHARED),0) -__fllib___depname = ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a +__fllib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a endif @@ -201,19 +287,19 @@ $(OBJS)\fllib_updatesmgr.o: ../../src/fl\updatesmgr.cpp clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll - -if exist ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a - -if exist ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a ifeq ($(SHARED),1) -..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.o $(OBJS)\fldll_antiflickpl.o $(OBJS)\fldll_bardragpl.o $(OBJS)\fldll_barhintspl.o $(OBJS)\fldll_cbcustom.o $(OBJS)\fldll_controlbar.o $(OBJS)\fldll_dyntbar.o $(OBJS)\fldll_dyntbarhnd.o $(OBJS)\fldll_frmview.o $(OBJS)\fldll_garbagec.o $(OBJS)\fldll_gcupdatesmgr.o $(OBJS)\fldll_hintanimpl.o $(OBJS)\fldll_newbmpbtn.o $(OBJS)\fldll_panedrawpl.o $(OBJS)\fldll_rowdragpl.o $(OBJS)\fldll_rowlayoutpl.o $(OBJS)\fldll_toolwnd.o $(OBJS)\fldll_updatesmgr.o - $(CXX) -shared -o $@ $(OBJS)\fldll_dummy.o $(OBJS)\fldll_antiflickpl.o $(OBJS)\fldll_bardragpl.o $(OBJS)\fldll_barhintspl.o $(OBJS)\fldll_cbcustom.o $(OBJS)\fldll_controlbar.o $(OBJS)\fldll_dyntbar.o $(OBJS)\fldll_dyntbarhnd.o $(OBJS)\fldll_frmview.o $(OBJS)\fldll_garbagec.o $(OBJS)\fldll_gcupdatesmgr.o $(OBJS)\fldll_hintanimpl.o $(OBJS)\fldll_newbmpbtn.o $(OBJS)\fldll_panedrawpl.o $(OBJS)\fldll_rowdragpl.o $(OBJS)\fldll_rowlayoutpl.o $(OBJS)\fldll_toolwnd.o $(OBJS)\fldll_updatesmgr.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -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) +$(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) endif ifeq ($(SHARED),0) -..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a: $(OBJS)\fllib_dummy.o $(OBJS)\fllib_antiflickpl.o $(OBJS)\fllib_bardragpl.o $(OBJS)\fllib_barhintspl.o $(OBJS)\fllib_cbcustom.o $(OBJS)\fllib_controlbar.o $(OBJS)\fllib_dyntbar.o $(OBJS)\fllib_dyntbarhnd.o $(OBJS)\fllib_frmview.o $(OBJS)\fllib_garbagec.o $(OBJS)\fllib_gcupdatesmgr.o $(OBJS)\fllib_hintanimpl.o $(OBJS)\fllib_newbmpbtn.o $(OBJS)\fllib_panedrawpl.o $(OBJS)\fllib_rowdragpl.o $(OBJS)\fllib_rowlayoutpl.o $(OBJS)\fllib_toolwnd.o $(OBJS)\fllib_updatesmgr.o +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a: $(FLLIB_OBJECTS) if exist $@ del $@ - ar rcu $@ $(OBJS)\fllib_dummy.o $(OBJS)\fllib_antiflickpl.o $(OBJS)\fllib_bardragpl.o $(OBJS)\fllib_barhintspl.o $(OBJS)\fllib_cbcustom.o $(OBJS)\fllib_controlbar.o $(OBJS)\fllib_dyntbar.o $(OBJS)\fllib_dyntbarhnd.o $(OBJS)\fllib_frmview.o $(OBJS)\fllib_garbagec.o $(OBJS)\fllib_gcupdatesmgr.o $(OBJS)\fllib_hintanimpl.o $(OBJS)\fllib_newbmpbtn.o $(OBJS)\fllib_panedrawpl.o $(OBJS)\fllib_rowdragpl.o $(OBJS)\fllib_rowlayoutpl.o $(OBJS)\fllib_toolwnd.o $(OBJS)\fllib_updatesmgr.o + ar rcu $@ $(FLLIB_OBJECTS) ranlib $@ endif diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc index 2e51c65d70..2f2b3477d9 100644 --- a/contrib/build/fl/makefile.vc +++ b/contrib/build/fl/makefile.vc @@ -12,9 +12,69 @@ ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include /I..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /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 /Fp$(OBJS)\wxprec_fldll.pch /I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL $(CXXFLAGS) /Yuwx/wxprec.h -FLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include /I..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /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 /Fp$(OBJS)\wxprec_fllib.pch /I..\..\src\fl\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +FLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /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 /I..\..\src\fl\..\..\include \ + /DWXUSINGDLL /DWXMAKINGDLL_FL $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_fldll.pch" +FLDLL_OBJECTS = \ + $(OBJS)\fldll_dummy.obj \ + $(OBJS)\fldll_antiflickpl.obj \ + $(OBJS)\fldll_bardragpl.obj \ + $(OBJS)\fldll_barhintspl.obj \ + $(OBJS)\fldll_cbcustom.obj \ + $(OBJS)\fldll_controlbar.obj \ + $(OBJS)\fldll_dyntbar.obj \ + $(OBJS)\fldll_dyntbarhnd.obj \ + $(OBJS)\fldll_frmview.obj \ + $(OBJS)\fldll_garbagec.obj \ + $(OBJS)\fldll_gcupdatesmgr.obj \ + $(OBJS)\fldll_hintanimpl.obj \ + $(OBJS)\fldll_newbmpbtn.obj \ + $(OBJS)\fldll_panedrawpl.obj \ + $(OBJS)\fldll_rowdragpl.obj \ + $(OBJS)\fldll_rowlayoutpl.obj \ + $(OBJS)\fldll_toolwnd.obj \ + $(OBJS)\fldll_updatesmgr.obj +FLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /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 /I..\..\src\fl\..\..\include \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch" +FLLIB_OBJECTS = \ + $(OBJS)\fllib_dummy.obj \ + $(OBJS)\fllib_antiflickpl.obj \ + $(OBJS)\fllib_bardragpl.obj \ + $(OBJS)\fllib_barhintspl.obj \ + $(OBJS)\fllib_cbcustom.obj \ + $(OBJS)\fllib_controlbar.obj \ + $(OBJS)\fllib_dyntbar.obj \ + $(OBJS)\fllib_dyntbarhnd.obj \ + $(OBJS)\fllib_frmview.obj \ + $(OBJS)\fllib_garbagec.obj \ + $(OBJS)\fllib_gcupdatesmgr.obj \ + $(OBJS)\fllib_hintanimpl.obj \ + $(OBJS)\fllib_newbmpbtn.obj \ + $(OBJS)\fllib_panedrawpl.obj \ + $(OBJS)\fllib_rowdragpl.obj \ + $(OBJS)\fllib_rowlayoutpl.obj \ + $(OBJS)\fllib_toolwnd.obj \ + $(OBJS)\fllib_updatesmgr.obj +LIBDIRNAME = \ + ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -30,7 +90,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -42,27 +105,75 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -82,25 +193,53 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" -__fldll___depname = ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll +__fldll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" -__fllib___depname = ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +__fllib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib !endif @@ -223,21 +362,21 @@ $(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll - -if exist ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib - -if exist ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib !if "$(SHARED)" == "1" -..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(FLDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib << !endif !if "$(SHARED)" == "0" -..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(FLLIB_OBJECTS) $(OBJS)\fllib_dummy.obj if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< - $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj + $(FLLIB_OBJECTS) << !endif diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat index 25db5d647f..24042e0027 100644 --- a/contrib/build/fl/makefile.wat +++ b/contrib/build/fl/makefile.wat @@ -43,6 +43,11 @@ VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -57,24 +62,61 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG = +__DEBUGINFO = !ifeq BUILD debug -__DEBUGFLAG = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG = !ifeq BUILD debug __OPTIMIZEFLAG = -od @@ -99,11 +141,13 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -111,18 +155,74 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ !endif __fldll___depname = !ifeq SHARED 1 -__fldll___depname = ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll +__fldll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll !endif __fllib___depname = !ifeq SHARED 0 -__fllib___depname = ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +__fllib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib !endif ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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 -i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $(CXXFLAGS) /fh=$(OBJS)\wxprec_fldll.pch -FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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 -i=..\..\src\fl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_fllib.pch -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +FLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -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 & + -i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_fldll.pch +FLDLL_OBJECTS = & + $(OBJS)\fldll_dummy.obj & + $(OBJS)\fldll_antiflickpl.obj & + $(OBJS)\fldll_bardragpl.obj & + $(OBJS)\fldll_barhintspl.obj & + $(OBJS)\fldll_cbcustom.obj & + $(OBJS)\fldll_controlbar.obj & + $(OBJS)\fldll_dyntbar.obj & + $(OBJS)\fldll_dyntbarhnd.obj & + $(OBJS)\fldll_frmview.obj & + $(OBJS)\fldll_garbagec.obj & + $(OBJS)\fldll_gcupdatesmgr.obj & + $(OBJS)\fldll_hintanimpl.obj & + $(OBJS)\fldll_newbmpbtn.obj & + $(OBJS)\fldll_panedrawpl.obj & + $(OBJS)\fldll_rowdragpl.obj & + $(OBJS)\fldll_rowlayoutpl.obj & + $(OBJS)\fldll_toolwnd.obj & + $(OBJS)\fldll_updatesmgr.obj +FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -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 & + -i=..\..\src\fl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_fllib.pch +FLLIB_OBJECTS = & + $(OBJS)\fllib_dummy.obj & + $(OBJS)\fllib_antiflickpl.obj & + $(OBJS)\fllib_bardragpl.obj & + $(OBJS)\fllib_barhintspl.obj & + $(OBJS)\fllib_cbcustom.obj & + $(OBJS)\fllib_controlbar.obj & + $(OBJS)\fllib_dyntbar.obj & + $(OBJS)\fllib_dyntbarhnd.obj & + $(OBJS)\fllib_frmview.obj & + $(OBJS)\fllib_garbagec.obj & + $(OBJS)\fllib_gcupdatesmgr.obj & + $(OBJS)\fllib_hintanimpl.obj & + $(OBJS)\fllib_newbmpbtn.obj & + $(OBJS)\fllib_panedrawpl.obj & + $(OBJS)\fllib_rowdragpl.obj & + $(OBJS)\fllib_rowlayoutpl.obj & + $(OBJS)\fllib_toolwnd.obj & + $(OBJS)\fllib_updatesmgr.obj +LIBDIRNAME = & + ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -247,28 +347,28 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll - -if exist ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib - -if exist ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib !ifeq SHARED 1 -..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll : $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll : $(FLDLL_OBJECTS) @%create $(OBJS)\fldll.lbc @%append $(OBJS)\fldll.lbc option quiet @%append $(OBJS)\fldll.lbc name $^@ @%append $(OBJS)\fldll.lbc option incremental - @%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - @for %i in ( $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj) do @%append $(OBJS)\fldll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\fldll.lbc library %i + @%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\fldll.lbc library %i @%append $(OBJS)\fldll.lbc @%append $(OBJS)\fldll.lbc system nt_dll wlink @$(OBJS)\fldll.lbc - wlib -q -n -b ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +$^@ + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +$^@ !endif !ifeq SHARED 0 -..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib : $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib : $(FLLIB_OBJECTS) @%create $(OBJS)\fllib.lbc - @for %i in ( $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj) do @%append $(OBJS)\fllib.lbc +%i + @for %i in ($(FLLIB_OBJECTS)) do @%append $(OBJS)\fllib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\fllib.lbc !endif diff --git a/contrib/build/gizmos/makefile.bcc b/contrib/build/gizmos/makefile.bcc index c4f64c4d80..0b65916b64 100644 --- a/contrib/build/gizmos/makefile.bcc +++ b/contrib/build/gizmos/makefile.bcc @@ -20,26 +20,42 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include \ - -I..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__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) -Hu -H=$(OBJS)\wxprec_gizmosdll.csm -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +GIZMOSDLL_OBJECTS = \ + $(OBJS)\gizmosdll_dummy.obj \ + $(OBJS)\gizmosdll_dynamicsash.obj \ + $(OBJS)\gizmosdll_editlbox.obj \ + $(OBJS)\gizmosdll_ledctrl.obj \ + $(OBJS)\gizmosdll_multicell.obj \ + $(OBJS)\gizmosdll_splittree.obj \ + $(OBJS)\gizmosdll_statpict.obj +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include \ - -I..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__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) -Hu \ -H=$(OBJS)\wxprec_gizmoslib.csm +GIZMOSLIB_OBJECTS = \ + $(OBJS)\gizmoslib_dummy.obj \ + $(OBJS)\gizmoslib_dynamicsash.obj \ + $(OBJS)\gizmoslib_editlbox.obj \ + $(OBJS)\gizmoslib_ledctrl.obj \ + $(OBJS)\gizmoslib_multicell.obj \ + $(OBJS)\gizmoslib_splittree.obj \ + $(OBJS)\gizmoslib_statpict.obj +LIBDIRNAME = \ + ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -57,7 +73,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -69,15 +88,33 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -115,11 +152,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(SHARED)" == "1" __gizmosdll___depname = \ - ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" __gizmoslib___depname = \ - ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib !endif @@ -176,22 +213,22 @@ $(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll - -if exist ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib - -if exist ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib !if "$(SHARED)" == "1" -..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| - c0d32.obj $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | - implib -f ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $@ !endif !if "$(SHARED)" == "0" -..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(GIZMOSLIB_OBJECTS) $(OBJS)\gizmoslib_dummy.obj if exist $@ del $@ tlib /a /p2048 $@ @&&| - $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj + $(GIZMOSLIB_OBJECTS) | !endif diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc index 1812de299d..faed7307c4 100644 --- a/contrib/build/gizmos/makefile.gcc +++ b/contrib/build/gizmos/makefile.gcc @@ -12,9 +12,43 @@ include ../../../build/config.gcc ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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) -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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) -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +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) +GIZMOSDLL_OBJECTS = \ + $(OBJS)\gizmosdll_dummy.o \ + $(OBJS)\gizmosdll_dynamicsash.o \ + $(OBJS)\gizmosdll_editlbox.o \ + $(OBJS)\gizmosdll_ledctrl.o \ + $(OBJS)\gizmosdll_multicell.o \ + $(OBJS)\gizmosdll_splittree.o \ + $(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) +GIZMOSLIB_OBJECTS = \ + $(OBJS)\gizmoslib_dummy.o \ + $(OBJS)\gizmoslib_dynamicsash.o \ + $(OBJS)\gizmoslib_editlbox.o \ + $(OBJS)\gizmoslib_ledctrl.o \ + $(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) ### Conditionally set variables: ### @@ -34,6 +68,11 @@ ifeq ($(OFFICIAL_BUILD),1) VENDORTAG = endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -46,14 +85,38 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif @@ -67,19 +130,23 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(SHARED),1) -__gizmosdll___depname = ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll +__gizmosdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll endif ifeq ($(SHARED),0) -__gizmoslib___depname = ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a +__gizmoslib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a endif @@ -135,19 +202,19 @@ $(OBJS)\gizmoslib_statpict.o: ../../src/gizmos\statpict.cpp clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll - -if exist ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a - -if exist ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a + -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)\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) -..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.o $(OBJS)\gizmosdll_dynamicsash.o $(OBJS)\gizmosdll_editlbox.o $(OBJS)\gizmosdll_ledctrl.o $(OBJS)\gizmosdll_multicell.o $(OBJS)\gizmosdll_splittree.o $(OBJS)\gizmosdll_statpict.o - $(CXX) -shared -o $@ $(OBJS)\gizmosdll_dummy.o $(OBJS)\gizmosdll_dynamicsash.o $(OBJS)\gizmosdll_editlbox.o $(OBJS)\gizmosdll_ledctrl.o $(OBJS)\gizmosdll_multicell.o $(OBJS)\gizmosdll_splittree.o $(OBJS)\gizmosdll_statpict.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -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)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) endif ifeq ($(SHARED),0) -..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a: $(OBJS)\gizmoslib_dummy.o $(OBJS)\gizmoslib_dynamicsash.o $(OBJS)\gizmoslib_editlbox.o $(OBJS)\gizmoslib_ledctrl.o $(OBJS)\gizmoslib_multicell.o $(OBJS)\gizmoslib_splittree.o $(OBJS)\gizmoslib_statpict.o +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a: $(GIZMOSLIB_OBJECTS) if exist $@ del $@ - ar rcu $@ $(OBJS)\gizmoslib_dummy.o $(OBJS)\gizmoslib_dynamicsash.o $(OBJS)\gizmoslib_editlbox.o $(OBJS)\gizmoslib_ledctrl.o $(OBJS)\gizmoslib_multicell.o $(OBJS)\gizmoslib_splittree.o $(OBJS)\gizmoslib_statpict.o + ar rcu $@ $(GIZMOSLIB_OBJECTS) ranlib $@ endif diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc index abb9471b27..d6e3ef5342 100644 --- a/contrib/build/gizmos/makefile.vc +++ b/contrib/build/gizmos/makefile.vc @@ -12,9 +12,50 @@ ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /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 /Fp$(OBJS)\wxprec_gizmosdll.pch /I..\..\src\gizmos\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_GIZMOS $(CXXFLAGS) /Yuwx/wxprec.h -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /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 /Fp$(OBJS)\wxprec_gizmoslib.pch /I..\..\src\gizmos\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /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) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gizmosdll.pch" +GIZMOSDLL_OBJECTS = \ + $(OBJS)\gizmosdll_dummy.obj \ + $(OBJS)\gizmosdll_dynamicsash.obj \ + $(OBJS)\gizmosdll_editlbox.obj \ + $(OBJS)\gizmosdll_ledctrl.obj \ + $(OBJS)\gizmosdll_multicell.obj \ + $(OBJS)\gizmosdll_splittree.obj \ + $(OBJS)\gizmosdll_statpict.obj +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /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) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_gizmoslib.pch" +GIZMOSLIB_OBJECTS = \ + $(OBJS)\gizmoslib_dummy.obj \ + $(OBJS)\gizmoslib_dynamicsash.obj \ + $(OBJS)\gizmoslib_editlbox.obj \ + $(OBJS)\gizmoslib_ledctrl.obj \ + $(OBJS)\gizmoslib_multicell.obj \ + $(OBJS)\gizmoslib_splittree.obj \ + $(OBJS)\gizmoslib_statpict.obj +LIBDIRNAME = \ + ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -30,7 +71,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -42,27 +86,75 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -82,25 +174,53 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" -__gizmosdll___depname = ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll +__gizmosdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" -__gizmoslib___depname = ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +__gizmoslib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib !endif @@ -157,21 +277,21 @@ $(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll - -if exist ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib - -if exist ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib !if "$(SHARED)" == "1" -..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(GIZMOSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib << !endif !if "$(SHARED)" == "0" -..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(GIZMOSLIB_OBJECTS) $(OBJS)\gizmoslib_dummy.obj if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< - $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj + $(GIZMOSLIB_OBJECTS) << !endif diff --git a/contrib/build/gizmos/makefile.wat b/contrib/build/gizmos/makefile.wat index 395313e5eb..f5d666526a 100644 --- a/contrib/build/gizmos/makefile.wat +++ b/contrib/build/gizmos/makefile.wat @@ -43,6 +43,11 @@ VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -57,24 +62,61 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG = +__DEBUGINFO = !ifeq BUILD debug -__DEBUGFLAG = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG = !ifeq BUILD debug __OPTIMIZEFLAG = -od @@ -99,11 +141,13 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -111,18 +155,59 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ !endif __gizmosdll___depname = !ifeq SHARED 1 -__gizmosdll___depname = ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll +__gizmosdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll !endif __gizmoslib___depname = !ifeq SHARED 0 -__gizmoslib___depname = ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +__gizmoslib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib !endif ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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) /fh=$(OBJS)\wxprec_gizmosdll.pch -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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) /fh=$(OBJS)\wxprec_gizmoslib.pch -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -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) /fh=$(OBJS)\wxprec_gizmosdll.pch +GIZMOSDLL_OBJECTS = & + $(OBJS)\gizmosdll_dummy.obj & + $(OBJS)\gizmosdll_dynamicsash.obj & + $(OBJS)\gizmosdll_editlbox.obj & + $(OBJS)\gizmosdll_ledctrl.obj & + $(OBJS)\gizmosdll_multicell.obj & + $(OBJS)\gizmosdll_splittree.obj & + $(OBJS)\gizmosdll_statpict.obj +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -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) & + /fh=$(OBJS)\wxprec_gizmoslib.pch +GIZMOSLIB_OBJECTS = & + $(OBJS)\gizmoslib_dummy.obj & + $(OBJS)\gizmoslib_dynamicsash.obj & + $(OBJS)\gizmoslib_editlbox.obj & + $(OBJS)\gizmoslib_ledctrl.obj & + $(OBJS)\gizmoslib_multicell.obj & + $(OBJS)\gizmoslib_splittree.obj & + $(OBJS)\gizmoslib_statpict.obj +LIBDIRNAME = & + ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -181,28 +266,28 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll - -if exist ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib - -if exist ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib !ifeq SHARED 1 -..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll : $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll : $(GIZMOSDLL_OBJECTS) @%create $(OBJS)\gizmosdll.lbc @%append $(OBJS)\gizmosdll.lbc option quiet @%append $(OBJS)\gizmosdll.lbc name $^@ @%append $(OBJS)\gizmosdll.lbc option incremental - @%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - @for %i in ( $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj) do @%append $(OBJS)\gizmosdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p)) do @%append $(OBJS)\gizmosdll.lbc library %i + @%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p)) do @%append $(OBJS)\gizmosdll.lbc library %i @%append $(OBJS)\gizmosdll.lbc @%append $(OBJS)\gizmosdll.lbc system nt_dll wlink @$(OBJS)\gizmosdll.lbc - wlib -q -n -b ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +$^@ + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +$^@ !endif !ifeq SHARED 0 -..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib : $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib : $(GIZMOSLIB_OBJECTS) @%create $(OBJS)\gizmoslib.lbc - @for %i in ( $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj) do @%append $(OBJS)\gizmoslib.lbc +%i + @for %i in ($(GIZMOSLIB_OBJECTS)) do @%append $(OBJS)\gizmoslib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\gizmoslib.lbc !endif diff --git a/contrib/build/ogl/makefile.bcc b/contrib/build/ogl/makefile.bcc index 486679a6cd..5aa6751bc5 100644 --- a/contrib/build/ogl/makefile.bcc +++ b/contrib/build/ogl/makefile.bcc @@ -20,25 +20,53 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +LIBDIRNAME = \ + ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \ - -I..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \ -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \ -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib \ - -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL \ - -DwxUSE_DEPRECATED=0 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_ogldll.csm -OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_ogldll.csm +OGLDLL_OBJECTS = \ + $(OBJS)\ogldll_dummy.obj \ + $(OBJS)\ogldll_basic2.obj \ + $(OBJS)\ogldll_canvas.obj \ + $(OBJS)\ogldll_divided.obj \ + $(OBJS)\ogldll_mfutils.obj \ + $(OBJS)\ogldll_oglmisc.obj \ + $(OBJS)\ogldll_basic.obj \ + $(OBJS)\ogldll_composit.obj \ + $(OBJS)\ogldll_drawn.obj \ + $(OBJS)\ogldll_bmpshape.obj \ + $(OBJS)\ogldll_constrnt.obj \ + $(OBJS)\ogldll_lines.obj \ + $(OBJS)\ogldll_ogldiag.obj +OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \ - -I..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \ -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \ -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib \ -I..\..\src\ogl\..\..\include $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_ogllib.csm +OGLLIB_OBJECTS = \ + $(OBJS)\ogllib_dummy.obj \ + $(OBJS)\ogllib_basic2.obj \ + $(OBJS)\ogllib_canvas.obj \ + $(OBJS)\ogllib_divided.obj \ + $(OBJS)\ogllib_mfutils.obj \ + $(OBJS)\ogllib_oglmisc.obj \ + $(OBJS)\ogllib_basic.obj \ + $(OBJS)\ogllib_composit.obj \ + $(OBJS)\ogllib_drawn.obj \ + $(OBJS)\ogllib_bmpshape.obj \ + $(OBJS)\ogllib_constrnt.obj \ + $(OBJS)\ogllib_lines.obj \ + $(OBJS)\ogllib_ogldiag.obj ### Conditionally set variables: ### @@ -54,7 +82,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -66,15 +97,33 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -112,11 +161,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(SHARED)" == "1" __ogldll___depname = \ - ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" __ogllib___depname = \ - ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib !endif @@ -209,22 +258,22 @@ $(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll - -if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib - -if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib !if "$(SHARED)" == "1" -..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| - c0d32.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | - implib -f ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@ !endif !if "$(SHARED)" == "0" -..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OGLLIB_OBJECTS) $(OBJS)\ogllib_dummy.obj if exist $@ del $@ tlib /a /p2048 $@ @&&| - $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj + $(OGLLIB_OBJECTS) | !endif diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc index 8ab3ed3c6c..9275c748be 100644 --- a/contrib/build/ogl/makefile.gcc +++ b/contrib/build/ogl/makefile.gcc @@ -12,9 +12,52 @@ include ../../../build/config.gcc ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL -DwxUSE_DEPRECATED=0 $(CXXFLAGS) -OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib -I..\..\src\ogl\..\..\include $(CXXFLAGS) +LIBDIRNAME = \ + ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \ + -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \ + -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib \ + -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) +OGLDLL_OBJECTS = \ + $(OBJS)\ogldll_dummy.o \ + $(OBJS)\ogldll_basic2.o \ + $(OBJS)\ogldll_canvas.o \ + $(OBJS)\ogldll_divided.o \ + $(OBJS)\ogldll_mfutils.o \ + $(OBJS)\ogldll_oglmisc.o \ + $(OBJS)\ogldll_basic.o \ + $(OBJS)\ogldll_composit.o \ + $(OBJS)\ogldll_drawn.o \ + $(OBJS)\ogldll_bmpshape.o \ + $(OBJS)\ogldll_constrnt.o \ + $(OBJS)\ogldll_lines.o \ + $(OBJS)\ogldll_ogldiag.o +OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \ + -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \ + -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib \ + -I..\..\src\ogl\..\..\include $(CXXFLAGS) +OGLLIB_OBJECTS = \ + $(OBJS)\ogllib_dummy.o \ + $(OBJS)\ogllib_basic2.o \ + $(OBJS)\ogllib_canvas.o \ + $(OBJS)\ogllib_divided.o \ + $(OBJS)\ogllib_mfutils.o \ + $(OBJS)\ogllib_oglmisc.o \ + $(OBJS)\ogllib_basic.o \ + $(OBJS)\ogllib_composit.o \ + $(OBJS)\ogllib_drawn.o \ + $(OBJS)\ogllib_bmpshape.o \ + $(OBJS)\ogllib_constrnt.o \ + $(OBJS)\ogllib_lines.o \ + $(OBJS)\ogllib_ogldiag.o ### Conditionally set variables: ### @@ -34,6 +77,11 @@ ifeq ($(OFFICIAL_BUILD),1) VENDORTAG = endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -46,14 +94,38 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif @@ -67,19 +139,23 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(SHARED),1) -__ogldll___depname = ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll +__ogldll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll endif ifeq ($(SHARED),0) -__ogllib___depname = ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a +__ogllib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a endif @@ -171,19 +247,19 @@ $(OBJS)\ogllib_oglmisc.o: ../../src/ogl\oglmisc.cpp clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll - -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a - -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a ifeq ($(SHARED),1) -..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.o $(OBJS)\ogldll_basic2.o $(OBJS)\ogldll_canvas.o $(OBJS)\ogldll_divided.o $(OBJS)\ogldll_mfutils.o $(OBJS)\ogldll_oglmisc.o $(OBJS)\ogldll_basic.o $(OBJS)\ogldll_composit.o $(OBJS)\ogldll_drawn.o $(OBJS)\ogldll_bmpshape.o $(OBJS)\ogldll_constrnt.o $(OBJS)\ogldll_lines.o $(OBJS)\ogldll_ogldiag.o - $(CXX) -shared -o $@ $(OBJS)\ogldll_dummy.o $(OBJS)\ogldll_basic2.o $(OBJS)\ogldll_canvas.o $(OBJS)\ogldll_divided.o $(OBJS)\ogldll_mfutils.o $(OBJS)\ogldll_oglmisc.o $(OBJS)\ogldll_basic.o $(OBJS)\ogldll_composit.o $(OBJS)\ogldll_drawn.o $(OBJS)\ogldll_bmpshape.o $(OBJS)\ogldll_constrnt.o $(OBJS)\ogldll_lines.o $(OBJS)\ogldll_ogldiag.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -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) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) + $(CXX) -shared -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.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) endif ifeq ($(SHARED),0) -..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a: $(OBJS)\ogllib_dummy.o $(OBJS)\ogllib_basic2.o $(OBJS)\ogllib_canvas.o $(OBJS)\ogllib_divided.o $(OBJS)\ogllib_mfutils.o $(OBJS)\ogllib_oglmisc.o $(OBJS)\ogllib_basic.o $(OBJS)\ogllib_composit.o $(OBJS)\ogllib_drawn.o $(OBJS)\ogllib_bmpshape.o $(OBJS)\ogllib_constrnt.o $(OBJS)\ogllib_lines.o $(OBJS)\ogllib_ogldiag.o +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a: $(OGLLIB_OBJECTS) if exist $@ del $@ - ar rcu $@ $(OBJS)\ogllib_dummy.o $(OBJS)\ogllib_basic2.o $(OBJS)\ogllib_canvas.o $(OBJS)\ogllib_divided.o $(OBJS)\ogllib_mfutils.o $(OBJS)\ogllib_oglmisc.o $(OBJS)\ogllib_basic.o $(OBJS)\ogllib_composit.o $(OBJS)\ogllib_drawn.o $(OBJS)\ogllib_bmpshape.o $(OBJS)\ogllib_constrnt.o $(OBJS)\ogllib_lines.o $(OBJS)\ogllib_ogldiag.o + ar rcu $@ $(OGLLIB_OBJECTS) ranlib $@ endif diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc index c5105e93a2..a989f0e715 100644 --- a/contrib/build/ogl/makefile.vc +++ b/contrib/build/ogl/makefile.vc @@ -12,9 +12,59 @@ ### Variables: ### -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\ogl\..\..\..\include /I..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\ogl\..\..\..\src\tiff /I..\..\src\ogl\..\..\..\src\jpeg /I..\..\src\ogl\..\..\..\src\png /I..\..\src\ogl\..\..\..\src\zlib /I..\..\src\ogl\..\..\..\src\regex /I..\..\src\ogl\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_ogldll.pch /I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL $(CXXFLAGS) /Yuwx/wxprec.h -OGLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\ogl\..\..\..\include /I..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\ogl\..\..\..\src\tiff /I..\..\src\ogl\..\..\..\src\jpeg /I..\..\src\ogl\..\..\..\src\png /I..\..\src\ogl\..\..\..\src\zlib /I..\..\src\ogl\..\..\..\src\regex /I..\..\src\ogl\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_ogllib.pch /I..\..\src\ogl\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h +LIBDIRNAME = \ + ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OGLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\ogl\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\ogl\..\..\..\src\tiff \ + /I..\..\src\ogl\..\..\..\src\jpeg /I..\..\src\ogl\..\..\..\src\png \ + /I..\..\src\ogl\..\..\..\src\zlib /I..\..\src\ogl\..\..\..\src\regex \ + /I..\..\src\ogl\..\..\..\src\expat\lib /I..\..\src\ogl\..\..\include \ + /DWXUSINGDLL /DWXMAKINGDLL_OGL $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_ogldll.pch" +OGLDLL_OBJECTS = \ + $(OBJS)\ogldll_dummy.obj \ + $(OBJS)\ogldll_basic2.obj \ + $(OBJS)\ogldll_canvas.obj \ + $(OBJS)\ogldll_divided.obj \ + $(OBJS)\ogldll_mfutils.obj \ + $(OBJS)\ogldll_oglmisc.obj \ + $(OBJS)\ogldll_basic.obj \ + $(OBJS)\ogldll_composit.obj \ + $(OBJS)\ogldll_drawn.obj \ + $(OBJS)\ogldll_bmpshape.obj \ + $(OBJS)\ogldll_constrnt.obj \ + $(OBJS)\ogldll_lines.obj \ + $(OBJS)\ogldll_ogldiag.obj +OGLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\ogl\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\ogl\..\..\..\src\tiff \ + /I..\..\src\ogl\..\..\..\src\jpeg /I..\..\src\ogl\..\..\..\src\png \ + /I..\..\src\ogl\..\..\..\src\zlib /I..\..\src\ogl\..\..\..\src\regex \ + /I..\..\src\ogl\..\..\..\src\expat\lib /I..\..\src\ogl\..\..\include \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch" +OGLLIB_OBJECTS = \ + $(OBJS)\ogllib_dummy.obj \ + $(OBJS)\ogllib_basic2.obj \ + $(OBJS)\ogllib_canvas.obj \ + $(OBJS)\ogllib_divided.obj \ + $(OBJS)\ogllib_mfutils.obj \ + $(OBJS)\ogllib_oglmisc.obj \ + $(OBJS)\ogllib_basic.obj \ + $(OBJS)\ogllib_composit.obj \ + $(OBJS)\ogllib_drawn.obj \ + $(OBJS)\ogllib_bmpshape.obj \ + $(OBJS)\ogllib_constrnt.obj \ + $(OBJS)\ogllib_lines.obj \ + $(OBJS)\ogllib_ogldiag.obj ### Conditionally set variables: ### @@ -30,7 +80,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -42,27 +95,75 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -82,25 +183,53 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" -__ogldll___depname = ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll +__ogldll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" -__ogllib___depname = ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +__ogllib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib !endif @@ -193,21 +322,21 @@ $(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll - -if exist ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib - -if exist ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib !if "$(SHARED)" == "1" -..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(OGLDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib << !endif !if "$(SHARED)" == "0" -..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OGLLIB_OBJECTS) $(OBJS)\ogllib_dummy.obj if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< - $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj + $(OGLLIB_OBJECTS) << !endif diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat index 650daa7e01..972de59c17 100644 --- a/contrib/build/ogl/makefile.wat +++ b/contrib/build/ogl/makefile.wat @@ -43,6 +43,11 @@ VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -57,24 +62,61 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG = +__DEBUGINFO = !ifeq BUILD debug -__DEBUGFLAG = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG = !ifeq BUILD debug __OPTIMIZEFLAG = -od @@ -99,11 +141,13 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -111,18 +155,65 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ !endif __ogldll___depname = !ifeq SHARED 1 -__ogldll___depname = ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll +__ogldll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll !endif __ogllib___depname = !ifeq SHARED 0 -__ogllib___depname = ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +__ogllib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib !endif ### Variables: ### -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib -i=..\..\src\ogl\..\..\..\src\regex -i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL -dwxUSE_DEPRECATED=0 $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogldll.pch -OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib -i=..\..\src\ogl\..\..\..\src\regex -i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch +LIBDIRNAME = & + ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OGLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg & + -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib & + -i=..\..\src\ogl\..\..\..\src\regex & + -i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include & + -dWXUSINGDLL -dWXMAKINGDLL_OGL $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogldll.pch +OGLDLL_OBJECTS = & + $(OBJS)\ogldll_dummy.obj & + $(OBJS)\ogldll_basic2.obj & + $(OBJS)\ogldll_canvas.obj & + $(OBJS)\ogldll_divided.obj & + $(OBJS)\ogldll_mfutils.obj & + $(OBJS)\ogldll_oglmisc.obj & + $(OBJS)\ogldll_basic.obj & + $(OBJS)\ogldll_composit.obj & + $(OBJS)\ogldll_drawn.obj & + $(OBJS)\ogldll_bmpshape.obj & + $(OBJS)\ogldll_constrnt.obj & + $(OBJS)\ogldll_lines.obj & + $(OBJS)\ogldll_ogldiag.obj +OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg & + -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib & + -i=..\..\src\ogl\..\..\..\src\regex & + -i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include & + $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch +OGLLIB_OBJECTS = & + $(OBJS)\ogllib_dummy.obj & + $(OBJS)\ogllib_basic2.obj & + $(OBJS)\ogllib_canvas.obj & + $(OBJS)\ogllib_divided.obj & + $(OBJS)\ogllib_mfutils.obj & + $(OBJS)\ogllib_oglmisc.obj & + $(OBJS)\ogllib_basic.obj & + $(OBJS)\ogllib_composit.obj & + $(OBJS)\ogllib_drawn.obj & + $(OBJS)\ogllib_bmpshape.obj & + $(OBJS)\ogllib_constrnt.obj & + $(OBJS)\ogllib_lines.obj & + $(OBJS)\ogllib_ogldiag.obj @@ -217,28 +308,28 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll - -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib - -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib !ifeq SHARED 1 -..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll : $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll : $(OGLDLL_OBJECTS) @%create $(OBJS)\ogldll.lbc @%append $(OBJS)\ogldll.lbc option quiet @%append $(OBJS)\ogldll.lbc name $^@ @%append $(OBJS)\ogldll.lbc option incremental - @%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - @for %i in ( $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj) do @%append $(OBJS)\ogldll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\ogldll.lbc library %i + @%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\ogldll.lbc library %i @%append $(OBJS)\ogldll.lbc @%append $(OBJS)\ogldll.lbc system nt_dll wlink @$(OBJS)\ogldll.lbc - wlib -q -n -b ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +$^@ + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +$^@ !endif !ifeq SHARED 0 -..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib : $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib : $(OGLLIB_OBJECTS) @%create $(OBJS)\ogllib.lbc - @for %i in ( $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj) do @%append $(OBJS)\ogllib.lbc +%i + @for %i in ($(OGLLIB_OBJECTS)) do @%append $(OBJS)\ogllib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\ogllib.lbc !endif diff --git a/contrib/build/stc/makefile.bcc b/contrib/build/stc/makefile.bcc index 8278fd90fc..d148ae000e 100644 --- a/contrib/build/stc/makefile.bcc +++ b/contrib/build/stc/makefile.bcc @@ -20,27 +20,127 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +LIBDIRNAME = \ + ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \ - -I..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \ -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \ -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \ -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) -STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +STCDLL_OBJECTS = \ + $(OBJS)\stcdll_PlatWX.obj \ + $(OBJS)\stcdll_ScintillaWX.obj \ + $(OBJS)\stcdll_stc.obj \ + $(OBJS)\stcdll_AutoComplete.obj \ + $(OBJS)\stcdll_CallTip.obj \ + $(OBJS)\stcdll_CellBuffer.obj \ + $(OBJS)\stcdll_ContractionState.obj \ + $(OBJS)\stcdll_Document.obj \ + $(OBJS)\stcdll_DocumentAccessor.obj \ + $(OBJS)\stcdll_Editor.obj \ + $(OBJS)\stcdll_ExternalLexer.obj \ + $(OBJS)\stcdll_Indicator.obj \ + $(OBJS)\stcdll_KeyMap.obj \ + $(OBJS)\stcdll_KeyWords.obj \ + $(OBJS)\stcdll_LexAVE.obj \ + $(OBJS)\stcdll_LexAda.obj \ + $(OBJS)\stcdll_LexAsm.obj \ + $(OBJS)\stcdll_LexBaan.obj \ + $(OBJS)\stcdll_LexBullant.obj \ + $(OBJS)\stcdll_LexCPP.obj \ + $(OBJS)\stcdll_LexCSS.obj \ + $(OBJS)\stcdll_LexConf.obj \ + $(OBJS)\stcdll_LexCrontab.obj \ + $(OBJS)\stcdll_LexEiffel.obj \ + $(OBJS)\stcdll_LexEScript.obj \ + $(OBJS)\stcdll_LexFortran.obj \ + $(OBJS)\stcdll_LexHTML.obj \ + $(OBJS)\stcdll_LexLisp.obj \ + $(OBJS)\stcdll_LexLout.obj \ + $(OBJS)\stcdll_LexLua.obj \ + $(OBJS)\stcdll_LexMatlab.obj \ + $(OBJS)\stcdll_LexOthers.obj \ + $(OBJS)\stcdll_LexPOV.obj \ + $(OBJS)\stcdll_LexPascal.obj \ + $(OBJS)\stcdll_LexPerl.obj \ + $(OBJS)\stcdll_LexPython.obj \ + $(OBJS)\stcdll_LexRuby.obj \ + $(OBJS)\stcdll_LexSQL.obj \ + $(OBJS)\stcdll_LexVB.obj \ + $(OBJS)\stcdll_LineMarker.obj \ + $(OBJS)\stcdll_PropSet.obj \ + $(OBJS)\stcdll_RESearch.obj \ + $(OBJS)\stcdll_ScintillaBase.obj \ + $(OBJS)\stcdll_Style.obj \ + $(OBJS)\stcdll_StyleContext.obj \ + $(OBJS)\stcdll_UniConversion.obj \ + $(OBJS)\stcdll_ViewStyle.obj \ + $(OBJS)\stcdll_WindowAccessor.obj \ + $(OBJS)\stcdll_XPM.obj +STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \ - -I..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \ -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \ -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \ -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) +STCLIB_OBJECTS = \ + $(OBJS)\stclib_PlatWX.obj \ + $(OBJS)\stclib_ScintillaWX.obj \ + $(OBJS)\stclib_stc.obj \ + $(OBJS)\stclib_AutoComplete.obj \ + $(OBJS)\stclib_CallTip.obj \ + $(OBJS)\stclib_CellBuffer.obj \ + $(OBJS)\stclib_ContractionState.obj \ + $(OBJS)\stclib_Document.obj \ + $(OBJS)\stclib_DocumentAccessor.obj \ + $(OBJS)\stclib_Editor.obj \ + $(OBJS)\stclib_ExternalLexer.obj \ + $(OBJS)\stclib_Indicator.obj \ + $(OBJS)\stclib_KeyMap.obj \ + $(OBJS)\stclib_KeyWords.obj \ + $(OBJS)\stclib_LexAVE.obj \ + $(OBJS)\stclib_LexAda.obj \ + $(OBJS)\stclib_LexAsm.obj \ + $(OBJS)\stclib_LexBaan.obj \ + $(OBJS)\stclib_LexBullant.obj \ + $(OBJS)\stclib_LexCPP.obj \ + $(OBJS)\stclib_LexCSS.obj \ + $(OBJS)\stclib_LexConf.obj \ + $(OBJS)\stclib_LexCrontab.obj \ + $(OBJS)\stclib_LexEiffel.obj \ + $(OBJS)\stclib_LexEScript.obj \ + $(OBJS)\stclib_LexFortran.obj \ + $(OBJS)\stclib_LexHTML.obj \ + $(OBJS)\stclib_LexLisp.obj \ + $(OBJS)\stclib_LexLout.obj \ + $(OBJS)\stclib_LexLua.obj \ + $(OBJS)\stclib_LexMatlab.obj \ + $(OBJS)\stclib_LexOthers.obj \ + $(OBJS)\stclib_LexPOV.obj \ + $(OBJS)\stclib_LexPascal.obj \ + $(OBJS)\stclib_LexPerl.obj \ + $(OBJS)\stclib_LexPython.obj \ + $(OBJS)\stclib_LexRuby.obj \ + $(OBJS)\stclib_LexSQL.obj \ + $(OBJS)\stclib_LexVB.obj \ + $(OBJS)\stclib_LineMarker.obj \ + $(OBJS)\stclib_PropSet.obj \ + $(OBJS)\stclib_RESearch.obj \ + $(OBJS)\stclib_ScintillaBase.obj \ + $(OBJS)\stclib_Style.obj \ + $(OBJS)\stclib_StyleContext.obj \ + $(OBJS)\stclib_UniConversion.obj \ + $(OBJS)\stclib_ViewStyle.obj \ + $(OBJS)\stclib_WindowAccessor.obj \ + $(OBJS)\stclib_XPM.obj ### Conditionally set variables: ### @@ -56,7 +156,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -68,15 +171,33 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -114,11 +235,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(SHARED)" == "1" __stcdll___depname = \ - ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" __stclib___depname = \ - ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib !endif @@ -427,22 +548,22 @@ $(OBJS)\stclib_stc.obj: ../../src/stc\stc.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll - -if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib - -if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib !if "$(SHARED)" == "1" -..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| - c0d32.obj $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(STCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | - implib -f ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@ !endif !if "$(SHARED)" == "0" -..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(STCLIB_OBJECTS) if exist $@ del $@ tlib /a /p2048 $@ @&&| - $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj + $(STCLIB_OBJECTS) | !endif diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc index 82218cf666..ea28442f60 100644 --- a/contrib/build/stc/makefile.gcc +++ b/contrib/build/stc/makefile.gcc @@ -12,9 +12,127 @@ include ../../../build/config.gcc ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -STCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) -STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) +LIBDIRNAME = \ + ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \ + -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \ + -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \ + -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) +STCDLL_OBJECTS = \ + $(OBJS)\stcdll_PlatWX.o \ + $(OBJS)\stcdll_ScintillaWX.o \ + $(OBJS)\stcdll_stc.o \ + $(OBJS)\stcdll_AutoComplete.o \ + $(OBJS)\stcdll_CallTip.o \ + $(OBJS)\stcdll_CellBuffer.o \ + $(OBJS)\stcdll_ContractionState.o \ + $(OBJS)\stcdll_Document.o \ + $(OBJS)\stcdll_DocumentAccessor.o \ + $(OBJS)\stcdll_Editor.o \ + $(OBJS)\stcdll_ExternalLexer.o \ + $(OBJS)\stcdll_Indicator.o \ + $(OBJS)\stcdll_KeyMap.o \ + $(OBJS)\stcdll_KeyWords.o \ + $(OBJS)\stcdll_LexAVE.o \ + $(OBJS)\stcdll_LexAda.o \ + $(OBJS)\stcdll_LexAsm.o \ + $(OBJS)\stcdll_LexBaan.o \ + $(OBJS)\stcdll_LexBullant.o \ + $(OBJS)\stcdll_LexCPP.o \ + $(OBJS)\stcdll_LexCSS.o \ + $(OBJS)\stcdll_LexConf.o \ + $(OBJS)\stcdll_LexCrontab.o \ + $(OBJS)\stcdll_LexEiffel.o \ + $(OBJS)\stcdll_LexEScript.o \ + $(OBJS)\stcdll_LexFortran.o \ + $(OBJS)\stcdll_LexHTML.o \ + $(OBJS)\stcdll_LexLisp.o \ + $(OBJS)\stcdll_LexLout.o \ + $(OBJS)\stcdll_LexLua.o \ + $(OBJS)\stcdll_LexMatlab.o \ + $(OBJS)\stcdll_LexOthers.o \ + $(OBJS)\stcdll_LexPOV.o \ + $(OBJS)\stcdll_LexPascal.o \ + $(OBJS)\stcdll_LexPerl.o \ + $(OBJS)\stcdll_LexPython.o \ + $(OBJS)\stcdll_LexRuby.o \ + $(OBJS)\stcdll_LexSQL.o \ + $(OBJS)\stcdll_LexVB.o \ + $(OBJS)\stcdll_LineMarker.o \ + $(OBJS)\stcdll_PropSet.o \ + $(OBJS)\stcdll_RESearch.o \ + $(OBJS)\stcdll_ScintillaBase.o \ + $(OBJS)\stcdll_Style.o \ + $(OBJS)\stcdll_StyleContext.o \ + $(OBJS)\stcdll_UniConversion.o \ + $(OBJS)\stcdll_ViewStyle.o \ + $(OBJS)\stcdll_WindowAccessor.o \ + $(OBJS)\stcdll_XPM.o +STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \ + -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \ + -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \ + -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) +STCLIB_OBJECTS = \ + $(OBJS)\stclib_PlatWX.o \ + $(OBJS)\stclib_ScintillaWX.o \ + $(OBJS)\stclib_stc.o \ + $(OBJS)\stclib_AutoComplete.o \ + $(OBJS)\stclib_CallTip.o \ + $(OBJS)\stclib_CellBuffer.o \ + $(OBJS)\stclib_ContractionState.o \ + $(OBJS)\stclib_Document.o \ + $(OBJS)\stclib_DocumentAccessor.o \ + $(OBJS)\stclib_Editor.o \ + $(OBJS)\stclib_ExternalLexer.o \ + $(OBJS)\stclib_Indicator.o \ + $(OBJS)\stclib_KeyMap.o \ + $(OBJS)\stclib_KeyWords.o \ + $(OBJS)\stclib_LexAVE.o \ + $(OBJS)\stclib_LexAda.o \ + $(OBJS)\stclib_LexAsm.o \ + $(OBJS)\stclib_LexBaan.o \ + $(OBJS)\stclib_LexBullant.o \ + $(OBJS)\stclib_LexCPP.o \ + $(OBJS)\stclib_LexCSS.o \ + $(OBJS)\stclib_LexConf.o \ + $(OBJS)\stclib_LexCrontab.o \ + $(OBJS)\stclib_LexEiffel.o \ + $(OBJS)\stclib_LexEScript.o \ + $(OBJS)\stclib_LexFortran.o \ + $(OBJS)\stclib_LexHTML.o \ + $(OBJS)\stclib_LexLisp.o \ + $(OBJS)\stclib_LexLout.o \ + $(OBJS)\stclib_LexLua.o \ + $(OBJS)\stclib_LexMatlab.o \ + $(OBJS)\stclib_LexOthers.o \ + $(OBJS)\stclib_LexPOV.o \ + $(OBJS)\stclib_LexPascal.o \ + $(OBJS)\stclib_LexPerl.o \ + $(OBJS)\stclib_LexPython.o \ + $(OBJS)\stclib_LexRuby.o \ + $(OBJS)\stclib_LexSQL.o \ + $(OBJS)\stclib_LexVB.o \ + $(OBJS)\stclib_LineMarker.o \ + $(OBJS)\stclib_PropSet.o \ + $(OBJS)\stclib_RESearch.o \ + $(OBJS)\stclib_ScintillaBase.o \ + $(OBJS)\stclib_Style.o \ + $(OBJS)\stclib_StyleContext.o \ + $(OBJS)\stclib_UniConversion.o \ + $(OBJS)\stclib_ViewStyle.o \ + $(OBJS)\stclib_WindowAccessor.o \ + $(OBJS)\stclib_XPM.o ### Conditionally set variables: ### @@ -34,6 +152,11 @@ ifeq ($(OFFICIAL_BUILD),1) VENDORTAG = endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -46,14 +169,38 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif @@ -67,19 +214,23 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(SHARED),1) -__stcdll___depname = ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll +__stcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll endif ifeq ($(SHARED),0) -__stclib___depname = ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a +__stclib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a endif @@ -387,19 +538,19 @@ $(OBJS)\stclib_stc.o: ../../src/stc\stc.cpp clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll - -if exist ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a - -if exist ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a ifeq ($(SHARED),1) -..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll: $(OBJS)\stcdll_PlatWX.o $(OBJS)\stcdll_ScintillaWX.o $(OBJS)\stcdll_stc.o $(OBJS)\stcdll_AutoComplete.o $(OBJS)\stcdll_CallTip.o $(OBJS)\stcdll_CellBuffer.o $(OBJS)\stcdll_ContractionState.o $(OBJS)\stcdll_Document.o $(OBJS)\stcdll_DocumentAccessor.o $(OBJS)\stcdll_Editor.o $(OBJS)\stcdll_ExternalLexer.o $(OBJS)\stcdll_Indicator.o $(OBJS)\stcdll_KeyMap.o $(OBJS)\stcdll_KeyWords.o $(OBJS)\stcdll_LexAVE.o $(OBJS)\stcdll_LexAda.o $(OBJS)\stcdll_LexAsm.o $(OBJS)\stcdll_LexBaan.o $(OBJS)\stcdll_LexBullant.o $(OBJS)\stcdll_LexCPP.o $(OBJS)\stcdll_LexCSS.o $(OBJS)\stcdll_LexConf.o $(OBJS)\stcdll_LexCrontab.o $(OBJS)\stcdll_LexEiffel.o $(OBJS)\stcdll_LexEScript.o $(OBJS)\stcdll_LexFortran.o $(OBJS)\stcdll_LexHTML.o $(OBJS)\stcdll_LexLisp.o $(OBJS)\stcdll_LexLout.o $(OBJS)\stcdll_LexLua.o $(OBJS)\stcdll_LexMatlab.o $(OBJS)\stcdll_LexOthers.o $(OBJS)\stcdll_LexPOV.o $(OBJS)\stcdll_LexPascal.o $(OBJS)\stcdll_LexPerl.o $(OBJS)\stcdll_LexPython.o $(OBJS)\stcdll_LexRuby.o $(OBJS)\stcdll_LexSQL.o $(OBJS)\stcdll_LexVB.o $(OBJS)\stcdll_LineMarker.o $(OBJS)\stcdll_PropSet.o $(OBJS)\stcdll_RESearch.o $(OBJS)\stcdll_ScintillaBase.o $(OBJS)\stcdll_Style.o $(OBJS)\stcdll_StyleContext.o $(OBJS)\stcdll_UniConversion.o $(OBJS)\stcdll_ViewStyle.o $(OBJS)\stcdll_WindowAccessor.o $(OBJS)\stcdll_XPM.o - $(CXX) -shared -o $@ $(OBJS)\stcdll_PlatWX.o $(OBJS)\stcdll_ScintillaWX.o $(OBJS)\stcdll_stc.o $(OBJS)\stcdll_AutoComplete.o $(OBJS)\stcdll_CallTip.o $(OBJS)\stcdll_CellBuffer.o $(OBJS)\stcdll_ContractionState.o $(OBJS)\stcdll_Document.o $(OBJS)\stcdll_DocumentAccessor.o $(OBJS)\stcdll_Editor.o $(OBJS)\stcdll_ExternalLexer.o $(OBJS)\stcdll_Indicator.o $(OBJS)\stcdll_KeyMap.o $(OBJS)\stcdll_KeyWords.o $(OBJS)\stcdll_LexAVE.o $(OBJS)\stcdll_LexAda.o $(OBJS)\stcdll_LexAsm.o $(OBJS)\stcdll_LexBaan.o $(OBJS)\stcdll_LexBullant.o $(OBJS)\stcdll_LexCPP.o $(OBJS)\stcdll_LexCSS.o $(OBJS)\stcdll_LexConf.o $(OBJS)\stcdll_LexCrontab.o $(OBJS)\stcdll_LexEiffel.o $(OBJS)\stcdll_LexEScript.o $(OBJS)\stcdll_LexFortran.o $(OBJS)\stcdll_LexHTML.o $(OBJS)\stcdll_LexLisp.o $(OBJS)\stcdll_LexLout.o $(OBJS)\stcdll_LexLua.o $(OBJS)\stcdll_LexMatlab.o $(OBJS)\stcdll_LexOthers.o $(OBJS)\stcdll_LexPOV.o $(OBJS)\stcdll_LexPascal.o $(OBJS)\stcdll_LexPerl.o $(OBJS)\stcdll_LexPython.o $(OBJS)\stcdll_LexRuby.o $(OBJS)\stcdll_LexSQL.o $(OBJS)\stcdll_LexVB.o $(OBJS)\stcdll_LineMarker.o $(OBJS)\stcdll_PropSet.o $(OBJS)\stcdll_RESearch.o $(OBJS)\stcdll_ScintillaBase.o $(OBJS)\stcdll_Style.o $(OBJS)\stcdll_StyleContext.o $(OBJS)\stcdll_UniConversion.o $(OBJS)\stcdll_ViewStyle.o $(OBJS)\stcdll_WindowAccessor.o $(OBJS)\stcdll_XPM.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -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) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) + $(CXX) -shared -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.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) endif ifeq ($(SHARED),0) -..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a: $(OBJS)\stclib_PlatWX.o $(OBJS)\stclib_ScintillaWX.o $(OBJS)\stclib_stc.o $(OBJS)\stclib_AutoComplete.o $(OBJS)\stclib_CallTip.o $(OBJS)\stclib_CellBuffer.o $(OBJS)\stclib_ContractionState.o $(OBJS)\stclib_Document.o $(OBJS)\stclib_DocumentAccessor.o $(OBJS)\stclib_Editor.o $(OBJS)\stclib_ExternalLexer.o $(OBJS)\stclib_Indicator.o $(OBJS)\stclib_KeyMap.o $(OBJS)\stclib_KeyWords.o $(OBJS)\stclib_LexAVE.o $(OBJS)\stclib_LexAda.o $(OBJS)\stclib_LexAsm.o $(OBJS)\stclib_LexBaan.o $(OBJS)\stclib_LexBullant.o $(OBJS)\stclib_LexCPP.o $(OBJS)\stclib_LexCSS.o $(OBJS)\stclib_LexConf.o $(OBJS)\stclib_LexCrontab.o $(OBJS)\stclib_LexEiffel.o $(OBJS)\stclib_LexEScript.o $(OBJS)\stclib_LexFortran.o $(OBJS)\stclib_LexHTML.o $(OBJS)\stclib_LexLisp.o $(OBJS)\stclib_LexLout.o $(OBJS)\stclib_LexLua.o $(OBJS)\stclib_LexMatlab.o $(OBJS)\stclib_LexOthers.o $(OBJS)\stclib_LexPOV.o $(OBJS)\stclib_LexPascal.o $(OBJS)\stclib_LexPerl.o $(OBJS)\stclib_LexPython.o $(OBJS)\stclib_LexRuby.o $(OBJS)\stclib_LexSQL.o $(OBJS)\stclib_LexVB.o $(OBJS)\stclib_LineMarker.o $(OBJS)\stclib_PropSet.o $(OBJS)\stclib_RESearch.o $(OBJS)\stclib_ScintillaBase.o $(OBJS)\stclib_Style.o $(OBJS)\stclib_StyleContext.o $(OBJS)\stclib_UniConversion.o $(OBJS)\stclib_ViewStyle.o $(OBJS)\stclib_WindowAccessor.o $(OBJS)\stclib_XPM.o +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a: $(STCLIB_OBJECTS) if exist $@ del $@ - ar rcu $@ $(OBJS)\stclib_PlatWX.o $(OBJS)\stclib_ScintillaWX.o $(OBJS)\stclib_stc.o $(OBJS)\stclib_AutoComplete.o $(OBJS)\stclib_CallTip.o $(OBJS)\stclib_CellBuffer.o $(OBJS)\stclib_ContractionState.o $(OBJS)\stclib_Document.o $(OBJS)\stclib_DocumentAccessor.o $(OBJS)\stclib_Editor.o $(OBJS)\stclib_ExternalLexer.o $(OBJS)\stclib_Indicator.o $(OBJS)\stclib_KeyMap.o $(OBJS)\stclib_KeyWords.o $(OBJS)\stclib_LexAVE.o $(OBJS)\stclib_LexAda.o $(OBJS)\stclib_LexAsm.o $(OBJS)\stclib_LexBaan.o $(OBJS)\stclib_LexBullant.o $(OBJS)\stclib_LexCPP.o $(OBJS)\stclib_LexCSS.o $(OBJS)\stclib_LexConf.o $(OBJS)\stclib_LexCrontab.o $(OBJS)\stclib_LexEiffel.o $(OBJS)\stclib_LexEScript.o $(OBJS)\stclib_LexFortran.o $(OBJS)\stclib_LexHTML.o $(OBJS)\stclib_LexLisp.o $(OBJS)\stclib_LexLout.o $(OBJS)\stclib_LexLua.o $(OBJS)\stclib_LexMatlab.o $(OBJS)\stclib_LexOthers.o $(OBJS)\stclib_LexPOV.o $(OBJS)\stclib_LexPascal.o $(OBJS)\stclib_LexPerl.o $(OBJS)\stclib_LexPython.o $(OBJS)\stclib_LexRuby.o $(OBJS)\stclib_LexSQL.o $(OBJS)\stclib_LexVB.o $(OBJS)\stclib_LineMarker.o $(OBJS)\stclib_PropSet.o $(OBJS)\stclib_RESearch.o $(OBJS)\stclib_ScintillaBase.o $(OBJS)\stclib_Style.o $(OBJS)\stclib_StyleContext.o $(OBJS)\stclib_UniConversion.o $(OBJS)\stclib_ViewStyle.o $(OBJS)\stclib_WindowAccessor.o $(OBJS)\stclib_XPM.o + ar rcu $@ $(STCLIB_OBJECTS) ranlib $@ endif diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc index 100625ccbc..23258a09f0 100644 --- a/contrib/build/stc/makefile.vc +++ b/contrib/build/stc/makefile.vc @@ -12,9 +12,132 @@ ### Variables: ### -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -STCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\stc\..\..\..\include /I..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\stc\..\..\..\src\tiff /I..\..\src\stc\..\..\..\src\jpeg /I..\..\src\stc\..\..\..\src\png /I..\..\src\stc\..\..\..\src\zlib /I..\..\src\stc\..\..\..\src\regex /I..\..\src\stc\..\..\..\src\expat\lib /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(CXXFLAGS) -STCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\stc\..\..\..\include /I..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\stc\..\..\..\src\tiff /I..\..\src\stc\..\..\..\src\jpeg /I..\..\src\stc\..\..\..\src\png /I..\..\src\stc\..\..\..\src\zlib /I..\..\src\stc\..\..\..\src\regex /I..\..\src\stc\..\..\..\src\expat\lib /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CXXFLAGS) +LIBDIRNAME = \ + ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\stc\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\stc\..\..\..\src\tiff \ + /I..\..\src\stc\..\..\..\src\jpeg /I..\..\src\stc\..\..\..\src\png \ + /I..\..\src\stc\..\..\..\src\zlib /I..\..\src\stc\..\..\..\src\regex \ + /I..\..\src\stc\..\..\..\src\expat\lib /I..\..\src\stc\..\..\include \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(CXXFLAGS) +STCDLL_OBJECTS = \ + $(OBJS)\stcdll_PlatWX.obj \ + $(OBJS)\stcdll_ScintillaWX.obj \ + $(OBJS)\stcdll_stc.obj \ + $(OBJS)\stcdll_AutoComplete.obj \ + $(OBJS)\stcdll_CallTip.obj \ + $(OBJS)\stcdll_CellBuffer.obj \ + $(OBJS)\stcdll_ContractionState.obj \ + $(OBJS)\stcdll_Document.obj \ + $(OBJS)\stcdll_DocumentAccessor.obj \ + $(OBJS)\stcdll_Editor.obj \ + $(OBJS)\stcdll_ExternalLexer.obj \ + $(OBJS)\stcdll_Indicator.obj \ + $(OBJS)\stcdll_KeyMap.obj \ + $(OBJS)\stcdll_KeyWords.obj \ + $(OBJS)\stcdll_LexAVE.obj \ + $(OBJS)\stcdll_LexAda.obj \ + $(OBJS)\stcdll_LexAsm.obj \ + $(OBJS)\stcdll_LexBaan.obj \ + $(OBJS)\stcdll_LexBullant.obj \ + $(OBJS)\stcdll_LexCPP.obj \ + $(OBJS)\stcdll_LexCSS.obj \ + $(OBJS)\stcdll_LexConf.obj \ + $(OBJS)\stcdll_LexCrontab.obj \ + $(OBJS)\stcdll_LexEiffel.obj \ + $(OBJS)\stcdll_LexEScript.obj \ + $(OBJS)\stcdll_LexFortran.obj \ + $(OBJS)\stcdll_LexHTML.obj \ + $(OBJS)\stcdll_LexLisp.obj \ + $(OBJS)\stcdll_LexLout.obj \ + $(OBJS)\stcdll_LexLua.obj \ + $(OBJS)\stcdll_LexMatlab.obj \ + $(OBJS)\stcdll_LexOthers.obj \ + $(OBJS)\stcdll_LexPOV.obj \ + $(OBJS)\stcdll_LexPascal.obj \ + $(OBJS)\stcdll_LexPerl.obj \ + $(OBJS)\stcdll_LexPython.obj \ + $(OBJS)\stcdll_LexRuby.obj \ + $(OBJS)\stcdll_LexSQL.obj \ + $(OBJS)\stcdll_LexVB.obj \ + $(OBJS)\stcdll_LineMarker.obj \ + $(OBJS)\stcdll_PropSet.obj \ + $(OBJS)\stcdll_RESearch.obj \ + $(OBJS)\stcdll_ScintillaBase.obj \ + $(OBJS)\stcdll_Style.obj \ + $(OBJS)\stcdll_StyleContext.obj \ + $(OBJS)\stcdll_UniConversion.obj \ + $(OBJS)\stcdll_ViewStyle.obj \ + $(OBJS)\stcdll_WindowAccessor.obj \ + $(OBJS)\stcdll_XPM.obj +STCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.pdb \ + $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\stc\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\stc\..\..\..\src\tiff \ + /I..\..\src\stc\..\..\..\src\jpeg /I..\..\src\stc\..\..\..\src\png \ + /I..\..\src\stc\..\..\..\src\zlib /I..\..\src\stc\..\..\..\src\regex \ + /I..\..\src\stc\..\..\..\src\expat\lib /I..\..\src\stc\..\..\include \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS $(CXXFLAGS) +STCLIB_OBJECTS = \ + $(OBJS)\stclib_PlatWX.obj \ + $(OBJS)\stclib_ScintillaWX.obj \ + $(OBJS)\stclib_stc.obj \ + $(OBJS)\stclib_AutoComplete.obj \ + $(OBJS)\stclib_CallTip.obj \ + $(OBJS)\stclib_CellBuffer.obj \ + $(OBJS)\stclib_ContractionState.obj \ + $(OBJS)\stclib_Document.obj \ + $(OBJS)\stclib_DocumentAccessor.obj \ + $(OBJS)\stclib_Editor.obj \ + $(OBJS)\stclib_ExternalLexer.obj \ + $(OBJS)\stclib_Indicator.obj \ + $(OBJS)\stclib_KeyMap.obj \ + $(OBJS)\stclib_KeyWords.obj \ + $(OBJS)\stclib_LexAVE.obj \ + $(OBJS)\stclib_LexAda.obj \ + $(OBJS)\stclib_LexAsm.obj \ + $(OBJS)\stclib_LexBaan.obj \ + $(OBJS)\stclib_LexBullant.obj \ + $(OBJS)\stclib_LexCPP.obj \ + $(OBJS)\stclib_LexCSS.obj \ + $(OBJS)\stclib_LexConf.obj \ + $(OBJS)\stclib_LexCrontab.obj \ + $(OBJS)\stclib_LexEiffel.obj \ + $(OBJS)\stclib_LexEScript.obj \ + $(OBJS)\stclib_LexFortran.obj \ + $(OBJS)\stclib_LexHTML.obj \ + $(OBJS)\stclib_LexLisp.obj \ + $(OBJS)\stclib_LexLout.obj \ + $(OBJS)\stclib_LexLua.obj \ + $(OBJS)\stclib_LexMatlab.obj \ + $(OBJS)\stclib_LexOthers.obj \ + $(OBJS)\stclib_LexPOV.obj \ + $(OBJS)\stclib_LexPascal.obj \ + $(OBJS)\stclib_LexPerl.obj \ + $(OBJS)\stclib_LexPython.obj \ + $(OBJS)\stclib_LexRuby.obj \ + $(OBJS)\stclib_LexSQL.obj \ + $(OBJS)\stclib_LexVB.obj \ + $(OBJS)\stclib_LineMarker.obj \ + $(OBJS)\stclib_PropSet.obj \ + $(OBJS)\stclib_RESearch.obj \ + $(OBJS)\stclib_ScintillaBase.obj \ + $(OBJS)\stclib_Style.obj \ + $(OBJS)\stclib_StyleContext.obj \ + $(OBJS)\stclib_UniConversion.obj \ + $(OBJS)\stclib_ViewStyle.obj \ + $(OBJS)\stclib_WindowAccessor.obj \ + $(OBJS)\stclib_XPM.obj ### Conditionally set variables: ### @@ -30,7 +153,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -42,27 +168,75 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_11 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_11 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_11 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -82,25 +256,53 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_10_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_10_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_10_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" -__stcdll___depname = ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll +__stcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" -__stclib___depname = ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +__stclib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib !endif @@ -409,21 +611,21 @@ $(OBJS)\stclib_stc.obj: ../../src/stc\stc.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll - -if exist ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib - -if exist ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib !if "$(SHARED)" == "1" -..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll: $(STCDLL_OBJECTS) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(STCDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib << !endif !if "$(SHARED)" == "0" -..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(STCLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< - $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj + $(STCLIB_OBJECTS) << !endif diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat index 03123fa1b4..839bd9e865 100644 --- a/contrib/build/stc/makefile.wat +++ b/contrib/build/stc/makefile.wat @@ -43,6 +43,11 @@ VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -57,24 +62,61 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG = +__DEBUGINFO = !ifeq BUILD debug -__DEBUGFLAG = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG = !ifeq BUILD debug __OPTIMIZEFLAG = -od @@ -99,11 +141,13 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -111,18 +155,139 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ !endif __stcdll___depname = !ifeq SHARED 1 -__stcdll___depname = ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll +__stcdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll !endif __stclib___depname = !ifeq SHARED 0 -__stclib___depname = ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +__stclib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib !endif ### Variables: ### -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -STCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\stc\..\..\..\src\tiff -i=..\..\src\stc\..\..\..\src\jpeg -i=..\..\src\stc\..\..\..\src\png -i=..\..\src\stc\..\..\..\src\zlib -i=..\..\src\stc\..\..\..\src\regex -i=..\..\src\stc\..\..\..\src\expat\lib -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $(CXXFLAGS) -STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\stc\..\..\..\src\tiff -i=..\..\src\stc\..\..\..\src\jpeg -i=..\..\src\stc\..\..\..\src\png -i=..\..\src\stc\..\..\..\src\zlib -i=..\..\src\stc\..\..\..\src\regex -i=..\..\src\stc\..\..\..\src\expat\lib -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $(CXXFLAGS) +LIBDIRNAME = & + ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\stc\..\..\..\src\tiff -i=..\..\src\stc\..\..\..\src\jpeg & + -i=..\..\src\stc\..\..\..\src\png -i=..\..\src\stc\..\..\..\src\zlib & + -i=..\..\src\stc\..\..\..\src\regex & + -i=..\..\src\stc\..\..\..\src\expat\lib -i=..\..\src\stc\..\..\include & + -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ & + -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $(CXXFLAGS) +STCDLL_OBJECTS = & + $(OBJS)\stcdll_PlatWX.obj & + $(OBJS)\stcdll_ScintillaWX.obj & + $(OBJS)\stcdll_stc.obj & + $(OBJS)\stcdll_AutoComplete.obj & + $(OBJS)\stcdll_CallTip.obj & + $(OBJS)\stcdll_CellBuffer.obj & + $(OBJS)\stcdll_ContractionState.obj & + $(OBJS)\stcdll_Document.obj & + $(OBJS)\stcdll_DocumentAccessor.obj & + $(OBJS)\stcdll_Editor.obj & + $(OBJS)\stcdll_ExternalLexer.obj & + $(OBJS)\stcdll_Indicator.obj & + $(OBJS)\stcdll_KeyMap.obj & + $(OBJS)\stcdll_KeyWords.obj & + $(OBJS)\stcdll_LexAVE.obj & + $(OBJS)\stcdll_LexAda.obj & + $(OBJS)\stcdll_LexAsm.obj & + $(OBJS)\stcdll_LexBaan.obj & + $(OBJS)\stcdll_LexBullant.obj & + $(OBJS)\stcdll_LexCPP.obj & + $(OBJS)\stcdll_LexCSS.obj & + $(OBJS)\stcdll_LexConf.obj & + $(OBJS)\stcdll_LexCrontab.obj & + $(OBJS)\stcdll_LexEiffel.obj & + $(OBJS)\stcdll_LexEScript.obj & + $(OBJS)\stcdll_LexFortran.obj & + $(OBJS)\stcdll_LexHTML.obj & + $(OBJS)\stcdll_LexLisp.obj & + $(OBJS)\stcdll_LexLout.obj & + $(OBJS)\stcdll_LexLua.obj & + $(OBJS)\stcdll_LexMatlab.obj & + $(OBJS)\stcdll_LexOthers.obj & + $(OBJS)\stcdll_LexPOV.obj & + $(OBJS)\stcdll_LexPascal.obj & + $(OBJS)\stcdll_LexPerl.obj & + $(OBJS)\stcdll_LexPython.obj & + $(OBJS)\stcdll_LexRuby.obj & + $(OBJS)\stcdll_LexSQL.obj & + $(OBJS)\stcdll_LexVB.obj & + $(OBJS)\stcdll_LineMarker.obj & + $(OBJS)\stcdll_PropSet.obj & + $(OBJS)\stcdll_RESearch.obj & + $(OBJS)\stcdll_ScintillaBase.obj & + $(OBJS)\stcdll_Style.obj & + $(OBJS)\stcdll_StyleContext.obj & + $(OBJS)\stcdll_UniConversion.obj & + $(OBJS)\stcdll_ViewStyle.obj & + $(OBJS)\stcdll_WindowAccessor.obj & + $(OBJS)\stcdll_XPM.obj +STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\stc\..\..\..\src\tiff -i=..\..\src\stc\..\..\..\src\jpeg & + -i=..\..\src\stc\..\..\..\src\png -i=..\..\src\stc\..\..\..\src\zlib & + -i=..\..\src\stc\..\..\..\src\regex & + -i=..\..\src\stc\..\..\..\src\expat\lib -i=..\..\src\stc\..\..\include & + -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ & + -dSCI_LEXER -dLINK_LEXERS $(CXXFLAGS) +STCLIB_OBJECTS = & + $(OBJS)\stclib_PlatWX.obj & + $(OBJS)\stclib_ScintillaWX.obj & + $(OBJS)\stclib_stc.obj & + $(OBJS)\stclib_AutoComplete.obj & + $(OBJS)\stclib_CallTip.obj & + $(OBJS)\stclib_CellBuffer.obj & + $(OBJS)\stclib_ContractionState.obj & + $(OBJS)\stclib_Document.obj & + $(OBJS)\stclib_DocumentAccessor.obj & + $(OBJS)\stclib_Editor.obj & + $(OBJS)\stclib_ExternalLexer.obj & + $(OBJS)\stclib_Indicator.obj & + $(OBJS)\stclib_KeyMap.obj & + $(OBJS)\stclib_KeyWords.obj & + $(OBJS)\stclib_LexAVE.obj & + $(OBJS)\stclib_LexAda.obj & + $(OBJS)\stclib_LexAsm.obj & + $(OBJS)\stclib_LexBaan.obj & + $(OBJS)\stclib_LexBullant.obj & + $(OBJS)\stclib_LexCPP.obj & + $(OBJS)\stclib_LexCSS.obj & + $(OBJS)\stclib_LexConf.obj & + $(OBJS)\stclib_LexCrontab.obj & + $(OBJS)\stclib_LexEiffel.obj & + $(OBJS)\stclib_LexEScript.obj & + $(OBJS)\stclib_LexFortran.obj & + $(OBJS)\stclib_LexHTML.obj & + $(OBJS)\stclib_LexLisp.obj & + $(OBJS)\stclib_LexLout.obj & + $(OBJS)\stclib_LexLua.obj & + $(OBJS)\stclib_LexMatlab.obj & + $(OBJS)\stclib_LexOthers.obj & + $(OBJS)\stclib_LexPOV.obj & + $(OBJS)\stclib_LexPascal.obj & + $(OBJS)\stclib_LexPerl.obj & + $(OBJS)\stclib_LexPython.obj & + $(OBJS)\stclib_LexRuby.obj & + $(OBJS)\stclib_LexSQL.obj & + $(OBJS)\stclib_LexVB.obj & + $(OBJS)\stclib_LineMarker.obj & + $(OBJS)\stclib_PropSet.obj & + $(OBJS)\stclib_RESearch.obj & + $(OBJS)\stclib_ScintillaBase.obj & + $(OBJS)\stclib_Style.obj & + $(OBJS)\stclib_StyleContext.obj & + $(OBJS)\stclib_UniConversion.obj & + $(OBJS)\stclib_ViewStyle.obj & + $(OBJS)\stclib_WindowAccessor.obj & + $(OBJS)\stclib_XPM.obj @@ -433,28 +598,28 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll - -if exist ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib - -if exist ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib !ifeq SHARED 1 -..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll : $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll : $(STCDLL_OBJECTS) @%create $(OBJS)\stcdll.lbc @%append $(OBJS)\stcdll.lbc option quiet @%append $(OBJS)\stcdll.lbc name $^@ @%append $(OBJS)\stcdll.lbc option incremental - @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - @for %i in ( $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj) do @%append $(OBJS)\stcdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\stcdll.lbc library %i + @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\stcdll.lbc library %i @%append $(OBJS)\stcdll.lbc @%append $(OBJS)\stcdll.lbc system nt_dll wlink @$(OBJS)\stcdll.lbc - wlib -q -n -b ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +$^@ + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +$^@ !endif !ifeq SHARED 0 -..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib : $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib : $(STCLIB_OBJECTS) @%create $(OBJS)\stclib.lbc - @for %i in ( $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj) do @%append $(OBJS)\stclib.lbc +%i + @for %i in ($(STCLIB_OBJECTS)) do @%append $(OBJS)\stclib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\stclib.lbc !endif diff --git a/contrib/build/svg/makefile.bcc b/contrib/build/svg/makefile.bcc index 533d35fb31..d48cb02316 100644 --- a/contrib/build/svg/makefile.bcc +++ b/contrib/build/svg/makefile.bcc @@ -24,7 +24,7 @@ LIBDIRNAME = \ ..\..\src\svg\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\svg\..\..\..\src\tiff -I..\..\src\svg\..\..\..\src\jpeg \ @@ -35,7 +35,7 @@ SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ SVGDLL_OBJECTS = \ $(OBJS)\svgdll_dummy.obj \ $(OBJS)\svgdll_dcsvg.obj -SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\svg\..\..\..\src\tiff -I..\..\src\svg\..\..\..\src\jpeg \ @@ -60,7 +60,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -72,13 +75,22 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(USE_GUI)" == "1" @@ -164,7 +176,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_dummy.obj - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(SVGDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $@ diff --git a/contrib/build/svg/makefile.gcc b/contrib/build/svg/makefile.gcc index 1aa6136b44..cfbd0bc4bb 100644 --- a/contrib/build/svg/makefile.gcc +++ b/contrib/build/svg/makefile.gcc @@ -12,33 +12,27 @@ include ../../../build/config.gcc ### Variables: ### -LIBDIRNAME = ..\..\src\svg\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = \ ..\..\src\svg\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(LIBDIRNAME) -I..\..\src\svg\..\..\..\src\tiff -I..\..\src\svg\..\..\..\src\jpeg -I..\..\src\svg\..\..\..\src\png -I..\..\src\svg\..\..\..\src\zlib -I..\..\src\svg\..\..\..\src\regex -I..\..\src\svg\..\..\..\src\expat\lib -I..\..\src\svg\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_SVG $(CXXFLAGS) -SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\svg\..\..\..\src\tiff -I..\..\src\svg\..\..\..\src\jpeg \ -I..\..\src\svg\..\..\..\src\png -I..\..\src\svg\..\..\..\src\zlib \ -I..\..\src\svg\..\..\..\src\regex -I..\..\src\svg\..\..\..\src\expat\lib \ -I..\..\src\svg\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_SVG $(CXXFLAGS) -SVGDLL_OBJECTS = $(OBJS)\svgdll_dummy.o $(OBJS)\svgdll_dcsvg.o SVGDLL_OBJECTS = \ $(OBJS)\svgdll_dummy.o \ $(OBJS)\svgdll_dcsvg.o -SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(LIBDIRNAME) -I..\..\src\svg\..\..\..\src\tiff -I..\..\src\svg\..\..\..\src\jpeg -I..\..\src\svg\..\..\..\src\png -I..\..\src\svg\..\..\..\src\zlib -I..\..\src\svg\..\..\..\src\regex -I..\..\src\svg\..\..\..\src\expat\lib -I..\..\src\svg\..\..\include $(CXXFLAGS) -SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\svg\..\..\..\src\tiff -I..\..\src\svg\..\..\..\src\jpeg \ -I..\..\src\svg\..\..\..\src\png -I..\..\src\svg\..\..\..\src\zlib \ -I..\..\src\svg\..\..\..\src\regex -I..\..\src\svg\..\..\..\src\expat\lib \ -I..\..\src\svg\..\..\include $(CXXFLAGS) -SVGLIB_OBJECTS = $(OBJS)\svglib_dummy.o $(OBJS)\svglib_dcsvg.o SVGLIB_OBJECTS = \ $(OBJS)\svglib_dummy.o \ $(OBJS)\svglib_dcsvg.o @@ -61,6 +55,11 @@ ifeq ($(OFFICIAL_BUILD),1) VENDORTAG = endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -73,12 +72,27 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(USE_GUI),1) @@ -151,7 +165,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_gcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) - $(CXX) -shared -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.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 $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.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) endif ifeq ($(SHARED),0) diff --git a/contrib/build/svg/makefile.vc b/contrib/build/svg/makefile.vc index faaa2247ca..4b98f495f9 100644 --- a/contrib/build/svg/makefile.vc +++ b/contrib/build/svg/makefile.vc @@ -16,29 +16,30 @@ LIBDIRNAME = \ ..\..\src\svg\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_2) $(____DEBUGFLAG) \ +SVGDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\..\src\svg\..\..\..\include /I$(LIBDIRNAME) \ - /I..\..\src\svg\..\..\..\src\tiff /I..\..\src\svg\..\..\..\src\jpeg \ - /I..\..\src\svg\..\..\..\src\png /I..\..\src\svg\..\..\..\src\zlib \ - /I..\..\src\svg\..\..\..\src\regex /I..\..\src\svg\..\..\..\src\expat\lib \ - /I..\..\src\svg\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_SVG $(CXXFLAGS) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svgdll.pch" + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\svg\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\svg\..\..\..\src\tiff \ + /I..\..\src\svg\..\..\..\src\jpeg /I..\..\src\svg\..\..\..\src\png \ + /I..\..\src\svg\..\..\..\src\zlib /I..\..\src\svg\..\..\..\src\regex \ + /I..\..\src\svg\..\..\..\src\expat\lib /I..\..\src\svg\..\..\include \ + /DWXUSINGDLL /DWXMAKINGDLL_SVG $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_svgdll.pch" SVGDLL_OBJECTS = \ $(OBJS)\svgdll_dummy.obj \ $(OBJS)\svgdll_dcsvg.obj -SVGLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_2) $(____DEBUGFLAG) \ +SVGLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.pdb \ - $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I..\..\src\svg\..\..\..\include /I$(LIBDIRNAME) \ - /I..\..\src\svg\..\..\..\src\tiff /I..\..\src\svg\..\..\..\src\jpeg \ - /I..\..\src\svg\..\..\..\src\png /I..\..\src\svg\..\..\..\src\zlib \ - /I..\..\src\svg\..\..\..\src\regex /I..\..\src\svg\..\..\..\src\expat\lib \ - /I..\..\src\svg\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_svglib.pch" + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\svg\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\svg\..\..\..\src\tiff \ + /I..\..\src\svg\..\..\..\src\jpeg /I..\..\src\svg\..\..\..\src\png \ + /I..\..\src\svg\..\..\..\src\zlib /I..\..\src\svg\..\..\..\src\regex \ + /I..\..\src\svg\..\..\..\src\expat\lib /I..\..\src\svg\..\..\include \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svglib.pch" SVGLIB_OBJECTS = \ $(OBJS)\svglib_dummy.obj \ $(OBJS)\svglib_dcsvg.obj @@ -57,7 +58,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -69,25 +73,64 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_2 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_2 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(USE_GUI)" == "1" @@ -128,11 +171,35 @@ __WXLIB_MONO_p = \ !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" __svgdll___depname = \ @@ -173,7 +240,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_dummy.obj - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< $(SVGDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib << !endif diff --git a/contrib/build/svg/makefile.wat b/contrib/build/svg/makefile.wat index 40158f334d..4ca8b4af7a 100644 --- a/contrib/build/svg/makefile.wat +++ b/contrib/build/svg/makefile.wat @@ -43,6 +43,11 @@ VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -57,22 +62,47 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG = +__DEBUGINFO = !ifeq BUILD debug -__DEBUGFLAG = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 !endif -__DEBUGFLAG_1 = +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __LIB_JPEG_p = @@ -140,7 +170,7 @@ LIBDIRNAME = & ..\..\src\svg\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & +SVGDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\src\svg\..\..\..\include -i=$(LIBDIRNAME) & -i=..\..\src\svg\..\..\..\src\tiff -i=..\..\src\svg\..\..\..\src\jpeg & @@ -151,7 +181,7 @@ SVGDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & SVGDLL_OBJECTS = & $(OBJS)\svgdll_dummy.obj & $(OBJS)\svgdll_dcsvg.obj -SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & +SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\src\svg\..\..\..\include -i=$(LIBDIRNAME) & -i=..\..\src\svg\..\..\..\src\tiff -i=..\..\src\svg\..\..\..\src\jpeg & @@ -200,7 +230,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_wa @%append $(OBJS)\svgdll.lbc option quiet @%append $(OBJS)\svgdll.lbc name $^@ @%append $(OBJS)\svgdll.lbc option incremental - @%append $(OBJS)\svgdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath $(LIBDIRNAME) + @%append $(OBJS)\svgdll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) @for %i in ($(SVGDLL_OBJECTS)) do @%append $(OBJS)\svgdll.lbc file %i @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\svgdll.lbc library %i @%append $(OBJS)\svgdll.lbc diff --git a/contrib/build/xrc/makefile.bcc b/contrib/build/xrc/makefile.bcc index d1c8d21165..130c12f21a 100644 --- a/contrib/build/xrc/makefile.bcc +++ b/contrib/build/xrc/makefile.bcc @@ -20,26 +20,104 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +LIBDIRNAME = \ + ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ - -I..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \ -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \ -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib \ -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_xrcdll.csm -XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ +XRCDLL_OBJECTS = \ + $(OBJS)\xrcdll_dummy.obj \ + $(OBJS)\xrcdll_xmlres.obj \ + $(OBJS)\xrcdll_xh_bmp.obj \ + $(OBJS)\xrcdll_xh_bmpbt.obj \ + $(OBJS)\xrcdll_xh_bttn.obj \ + $(OBJS)\xrcdll_xh_cald.obj \ + $(OBJS)\xrcdll_xh_chckb.obj \ + $(OBJS)\xrcdll_xh_chckl.obj \ + $(OBJS)\xrcdll_xh_choic.obj \ + $(OBJS)\xrcdll_xh_combo.obj \ + $(OBJS)\xrcdll_xh_dlg.obj \ + $(OBJS)\xrcdll_xh_frame.obj \ + $(OBJS)\xrcdll_xh_gauge.obj \ + $(OBJS)\xrcdll_xh_gdctl.obj \ + $(OBJS)\xrcdll_xh_html.obj \ + $(OBJS)\xrcdll_xh_listb.obj \ + $(OBJS)\xrcdll_xh_listc.obj \ + $(OBJS)\xrcdll_xh_menu.obj \ + $(OBJS)\xrcdll_xh_notbk.obj \ + $(OBJS)\xrcdll_xh_panel.obj \ + $(OBJS)\xrcdll_xh_radbt.obj \ + $(OBJS)\xrcdll_xh_radbx.obj \ + $(OBJS)\xrcdll_xh_scrol.obj \ + $(OBJS)\xrcdll_xh_scwin.obj \ + $(OBJS)\xrcdll_xh_sizer.obj \ + $(OBJS)\xrcdll_xh_slidr.obj \ + $(OBJS)\xrcdll_xh_spin.obj \ + $(OBJS)\xrcdll_xh_split.obj \ + $(OBJS)\xrcdll_xh_stbmp.obj \ + $(OBJS)\xrcdll_xh_stbox.obj \ + $(OBJS)\xrcdll_xh_stlin.obj \ + $(OBJS)\xrcdll_xh_sttxt.obj \ + $(OBJS)\xrcdll_xh_text.obj \ + $(OBJS)\xrcdll_xh_toolb.obj \ + $(OBJS)\xrcdll_xh_tree.obj \ + $(OBJS)\xrcdll_xh_unkwn.obj \ + $(OBJS)\xrcdll_xh_wizrd.obj \ + $(OBJS)\xrcdll_xmlrsall.obj +XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ - -I..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(LIBDIRNAME) \ -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \ -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \ -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib \ -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse \ -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xrclib.csm +XRCLIB_OBJECTS = \ + $(OBJS)\xrclib_dummy.obj \ + $(OBJS)\xrclib_xmlres.obj \ + $(OBJS)\xrclib_xh_bmp.obj \ + $(OBJS)\xrclib_xh_bmpbt.obj \ + $(OBJS)\xrclib_xh_bttn.obj \ + $(OBJS)\xrclib_xh_cald.obj \ + $(OBJS)\xrclib_xh_chckb.obj \ + $(OBJS)\xrclib_xh_chckl.obj \ + $(OBJS)\xrclib_xh_choic.obj \ + $(OBJS)\xrclib_xh_combo.obj \ + $(OBJS)\xrclib_xh_dlg.obj \ + $(OBJS)\xrclib_xh_frame.obj \ + $(OBJS)\xrclib_xh_gauge.obj \ + $(OBJS)\xrclib_xh_gdctl.obj \ + $(OBJS)\xrclib_xh_html.obj \ + $(OBJS)\xrclib_xh_listb.obj \ + $(OBJS)\xrclib_xh_listc.obj \ + $(OBJS)\xrclib_xh_menu.obj \ + $(OBJS)\xrclib_xh_notbk.obj \ + $(OBJS)\xrclib_xh_panel.obj \ + $(OBJS)\xrclib_xh_radbt.obj \ + $(OBJS)\xrclib_xh_radbx.obj \ + $(OBJS)\xrclib_xh_scrol.obj \ + $(OBJS)\xrclib_xh_scwin.obj \ + $(OBJS)\xrclib_xh_sizer.obj \ + $(OBJS)\xrclib_xh_slidr.obj \ + $(OBJS)\xrclib_xh_spin.obj \ + $(OBJS)\xrclib_xh_split.obj \ + $(OBJS)\xrclib_xh_stbmp.obj \ + $(OBJS)\xrclib_xh_stbox.obj \ + $(OBJS)\xrclib_xh_stlin.obj \ + $(OBJS)\xrclib_xh_sttxt.obj \ + $(OBJS)\xrclib_xh_text.obj \ + $(OBJS)\xrclib_xh_toolb.obj \ + $(OBJS)\xrclib_xh_tree.obj \ + $(OBJS)\xrclib_xh_unkwn.obj \ + $(OBJS)\xrclib_xh_wizrd.obj \ + $(OBJS)\xrclib_xmlrsall.obj ### Conditionally set variables: ### @@ -55,7 +133,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -67,15 +148,33 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -120,11 +219,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(SHARED)" == "1" __xrcdll___depname = \ - ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" __xrclib___depname = \ - ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !endif @@ -367,22 +466,22 @@ $(OBJS)\xrclib_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll - -if exist ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib - -if exist ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !if "$(SHARED)" == "1" -..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| - c0d32.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | - implib -f ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@ !endif !if "$(SHARED)" == "0" -..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(XRCLIB_OBJECTS) $(OBJS)\xrclib_dummy.obj if exist $@ del $@ tlib /a /p2048 $@ @&&| - $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj + $(XRCLIB_OBJECTS) | !endif diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc index 8958fe3591..bbaf0cdd4d 100644 --- a/contrib/build/xrc/makefile.gcc +++ b/contrib/build/xrc/makefile.gcc @@ -12,9 +12,103 @@ include ../../../build/config.gcc ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) -XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) +LIBDIRNAME = \ + ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \ + -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \ + -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib \ + -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) +XRCDLL_OBJECTS = \ + $(OBJS)\xrcdll_dummy.o \ + $(OBJS)\xrcdll_xmlres.o \ + $(OBJS)\xrcdll_xh_bmp.o \ + $(OBJS)\xrcdll_xh_bmpbt.o \ + $(OBJS)\xrcdll_xh_bttn.o \ + $(OBJS)\xrcdll_xh_cald.o \ + $(OBJS)\xrcdll_xh_chckb.o \ + $(OBJS)\xrcdll_xh_chckl.o \ + $(OBJS)\xrcdll_xh_choic.o \ + $(OBJS)\xrcdll_xh_combo.o \ + $(OBJS)\xrcdll_xh_dlg.o \ + $(OBJS)\xrcdll_xh_frame.o \ + $(OBJS)\xrcdll_xh_gauge.o \ + $(OBJS)\xrcdll_xh_gdctl.o \ + $(OBJS)\xrcdll_xh_html.o \ + $(OBJS)\xrcdll_xh_listb.o \ + $(OBJS)\xrcdll_xh_listc.o \ + $(OBJS)\xrcdll_xh_menu.o \ + $(OBJS)\xrcdll_xh_notbk.o \ + $(OBJS)\xrcdll_xh_panel.o \ + $(OBJS)\xrcdll_xh_radbt.o \ + $(OBJS)\xrcdll_xh_radbx.o \ + $(OBJS)\xrcdll_xh_scrol.o \ + $(OBJS)\xrcdll_xh_scwin.o \ + $(OBJS)\xrcdll_xh_sizer.o \ + $(OBJS)\xrcdll_xh_slidr.o \ + $(OBJS)\xrcdll_xh_spin.o \ + $(OBJS)\xrcdll_xh_split.o \ + $(OBJS)\xrcdll_xh_stbmp.o \ + $(OBJS)\xrcdll_xh_stbox.o \ + $(OBJS)\xrcdll_xh_stlin.o \ + $(OBJS)\xrcdll_xh_sttxt.o \ + $(OBJS)\xrcdll_xh_text.o \ + $(OBJS)\xrcdll_xh_toolb.o \ + $(OBJS)\xrcdll_xh_tree.o \ + $(OBJS)\xrcdll_xh_unkwn.o \ + $(OBJS)\xrcdll_xh_wizrd.o \ + $(OBJS)\xrcdll_xmlrsall.o +XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\xrc\..\..\..\src\tiff -I..\..\src\xrc\..\..\..\src\jpeg \ + -I..\..\src\xrc\..\..\..\src\png -I..\..\src\xrc\..\..\..\src\zlib \ + -I..\..\src\xrc\..\..\..\src\regex -I..\..\src\xrc\..\..\..\src\expat\lib \ + -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse \ + -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) +XRCLIB_OBJECTS = \ + $(OBJS)\xrclib_dummy.o \ + $(OBJS)\xrclib_xmlres.o \ + $(OBJS)\xrclib_xh_bmp.o \ + $(OBJS)\xrclib_xh_bmpbt.o \ + $(OBJS)\xrclib_xh_bttn.o \ + $(OBJS)\xrclib_xh_cald.o \ + $(OBJS)\xrclib_xh_chckb.o \ + $(OBJS)\xrclib_xh_chckl.o \ + $(OBJS)\xrclib_xh_choic.o \ + $(OBJS)\xrclib_xh_combo.o \ + $(OBJS)\xrclib_xh_dlg.o \ + $(OBJS)\xrclib_xh_frame.o \ + $(OBJS)\xrclib_xh_gauge.o \ + $(OBJS)\xrclib_xh_gdctl.o \ + $(OBJS)\xrclib_xh_html.o \ + $(OBJS)\xrclib_xh_listb.o \ + $(OBJS)\xrclib_xh_listc.o \ + $(OBJS)\xrclib_xh_menu.o \ + $(OBJS)\xrclib_xh_notbk.o \ + $(OBJS)\xrclib_xh_panel.o \ + $(OBJS)\xrclib_xh_radbt.o \ + $(OBJS)\xrclib_xh_radbx.o \ + $(OBJS)\xrclib_xh_scrol.o \ + $(OBJS)\xrclib_xh_scwin.o \ + $(OBJS)\xrclib_xh_sizer.o \ + $(OBJS)\xrclib_xh_slidr.o \ + $(OBJS)\xrclib_xh_spin.o \ + $(OBJS)\xrclib_xh_split.o \ + $(OBJS)\xrclib_xh_stbmp.o \ + $(OBJS)\xrclib_xh_stbox.o \ + $(OBJS)\xrclib_xh_stlin.o \ + $(OBJS)\xrclib_xh_sttxt.o \ + $(OBJS)\xrclib_xh_text.o \ + $(OBJS)\xrclib_xh_toolb.o \ + $(OBJS)\xrclib_xh_tree.o \ + $(OBJS)\xrclib_xh_unkwn.o \ + $(OBJS)\xrclib_xh_wizrd.o \ + $(OBJS)\xrclib_xmlrsall.o ### Conditionally set variables: ### @@ -34,6 +128,11 @@ ifeq ($(OFFICIAL_BUILD),1) VENDORTAG = endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -46,14 +145,38 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif @@ -67,13 +190,16 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),0) -__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +__WXLIB_HTML_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) __WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml @@ -82,10 +208,12 @@ ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(SHARED),1) -__xrcdll___depname = ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll +__xrcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll endif ifeq ($(SHARED),0) -__xrclib___depname = ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a +__xrclib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a endif @@ -327,19 +455,19 @@ $(OBJS)\xrclib_xmlrsall.o: ../../src/xrc\xmlrsall.cpp clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll - -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a - -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a ifeq ($(SHARED),1) -..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o - $(CXX) -shared -o $@ $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) + $(CXX) -shared -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.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_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) -..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(XRCLIB_OBJECTS) if exist $@ del $@ - ar rcu $@ $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o + ar rcu $@ $(XRCLIB_OBJECTS) ranlib $@ endif diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc index ef60247b71..8268fb6a68 100644 --- a/contrib/build/xrc/makefile.vc +++ b/contrib/build/xrc/makefile.vc @@ -12,9 +12,110 @@ ### Variables: ### -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\xrc\..\..\..\src\tiff /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex /I..\..\src\xrc\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_xrcdll.pch /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC $(CXXFLAGS) /Yuwx/wxprec.h -XRCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) /DWIN32 $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb $(____DEBUGFLAG) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\xrc\..\..\..\src\tiff /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex /I..\..\src\xrc\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_xrclib.pch /I..\..\src\xrc\..\..\include /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CXXFLAGS) /Yuwx/wxprec.h +LIBDIRNAME = \ + ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\xrc\..\..\..\src\tiff \ + /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png \ + /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex \ + /I..\..\src\xrc\..\..\..\src\expat\lib /I..\..\src\xrc\..\..\include \ + /DWXUSINGDLL /DWXMAKINGDLL_XRC $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xrcdll.pch" +XRCDLL_OBJECTS = \ + $(OBJS)\xrcdll_dummy.obj \ + $(OBJS)\xrcdll_xmlres.obj \ + $(OBJS)\xrcdll_xh_bmp.obj \ + $(OBJS)\xrcdll_xh_bmpbt.obj \ + $(OBJS)\xrcdll_xh_bttn.obj \ + $(OBJS)\xrcdll_xh_cald.obj \ + $(OBJS)\xrcdll_xh_chckb.obj \ + $(OBJS)\xrcdll_xh_chckl.obj \ + $(OBJS)\xrcdll_xh_choic.obj \ + $(OBJS)\xrcdll_xh_combo.obj \ + $(OBJS)\xrcdll_xh_dlg.obj \ + $(OBJS)\xrcdll_xh_frame.obj \ + $(OBJS)\xrcdll_xh_gauge.obj \ + $(OBJS)\xrcdll_xh_gdctl.obj \ + $(OBJS)\xrcdll_xh_html.obj \ + $(OBJS)\xrcdll_xh_listb.obj \ + $(OBJS)\xrcdll_xh_listc.obj \ + $(OBJS)\xrcdll_xh_menu.obj \ + $(OBJS)\xrcdll_xh_notbk.obj \ + $(OBJS)\xrcdll_xh_panel.obj \ + $(OBJS)\xrcdll_xh_radbt.obj \ + $(OBJS)\xrcdll_xh_radbx.obj \ + $(OBJS)\xrcdll_xh_scrol.obj \ + $(OBJS)\xrcdll_xh_scwin.obj \ + $(OBJS)\xrcdll_xh_sizer.obj \ + $(OBJS)\xrcdll_xh_slidr.obj \ + $(OBJS)\xrcdll_xh_spin.obj \ + $(OBJS)\xrcdll_xh_split.obj \ + $(OBJS)\xrcdll_xh_stbmp.obj \ + $(OBJS)\xrcdll_xh_stbox.obj \ + $(OBJS)\xrcdll_xh_stlin.obj \ + $(OBJS)\xrcdll_xh_sttxt.obj \ + $(OBJS)\xrcdll_xh_text.obj \ + $(OBJS)\xrcdll_xh_toolb.obj \ + $(OBJS)\xrcdll_xh_tree.obj \ + $(OBJS)\xrcdll_xh_unkwn.obj \ + $(OBJS)\xrcdll_xh_wizrd.obj \ + $(OBJS)\xrcdll_xmlrsall.obj +XRCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\xrc\..\..\..\src\tiff \ + /I..\..\src\xrc\..\..\..\src\jpeg /I..\..\src\xrc\..\..\..\src\png \ + /I..\..\src\xrc\..\..\..\src\zlib /I..\..\src\xrc\..\..\..\src\regex \ + /I..\..\src\xrc\..\..\..\src\expat\lib /I..\..\src\xrc\..\..\include \ + /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CXXFLAGS) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" +XRCLIB_OBJECTS = \ + $(OBJS)\xrclib_dummy.obj \ + $(OBJS)\xrclib_xmlres.obj \ + $(OBJS)\xrclib_xh_bmp.obj \ + $(OBJS)\xrclib_xh_bmpbt.obj \ + $(OBJS)\xrclib_xh_bttn.obj \ + $(OBJS)\xrclib_xh_cald.obj \ + $(OBJS)\xrclib_xh_chckb.obj \ + $(OBJS)\xrclib_xh_chckl.obj \ + $(OBJS)\xrclib_xh_choic.obj \ + $(OBJS)\xrclib_xh_combo.obj \ + $(OBJS)\xrclib_xh_dlg.obj \ + $(OBJS)\xrclib_xh_frame.obj \ + $(OBJS)\xrclib_xh_gauge.obj \ + $(OBJS)\xrclib_xh_gdctl.obj \ + $(OBJS)\xrclib_xh_html.obj \ + $(OBJS)\xrclib_xh_listb.obj \ + $(OBJS)\xrclib_xh_listc.obj \ + $(OBJS)\xrclib_xh_menu.obj \ + $(OBJS)\xrclib_xh_notbk.obj \ + $(OBJS)\xrclib_xh_panel.obj \ + $(OBJS)\xrclib_xh_radbt.obj \ + $(OBJS)\xrclib_xh_radbx.obj \ + $(OBJS)\xrclib_xh_scrol.obj \ + $(OBJS)\xrclib_xh_scwin.obj \ + $(OBJS)\xrclib_xh_sizer.obj \ + $(OBJS)\xrclib_xh_slidr.obj \ + $(OBJS)\xrclib_xh_spin.obj \ + $(OBJS)\xrclib_xh_split.obj \ + $(OBJS)\xrclib_xh_stbmp.obj \ + $(OBJS)\xrclib_xh_stbox.obj \ + $(OBJS)\xrclib_xh_stlin.obj \ + $(OBJS)\xrclib_xh_sttxt.obj \ + $(OBJS)\xrclib_xh_text.obj \ + $(OBJS)\xrclib_xh_toolb.obj \ + $(OBJS)\xrclib_xh_tree.obj \ + $(OBJS)\xrclib_xh_unkwn.obj \ + $(OBJS)\xrclib_xh_wizrd.obj \ + $(OBJS)\xrclib_xmlrsall.obj ### Conditionally set variables: ### @@ -30,7 +131,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -42,27 +146,75 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -82,13 +234,16 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib @@ -96,17 +251,43 @@ __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" -__xrcdll___depname = ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll +__xrcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" -__xrclib___depname = ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +__xrclib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !endif @@ -349,21 +530,21 @@ $(OBJS)\xrclib_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll - -if exist ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib - -if exist ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !if "$(SHARED)" == "1" -..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(XRCDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib << !endif !if "$(SHARED)" == "0" -..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(XRCLIB_OBJECTS) $(OBJS)\xrclib_dummy.obj if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< - $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj + $(XRCLIB_OBJECTS) << !endif diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat index fccbd0d4cd..e8d4b8d27f 100644 --- a/contrib/build/xrc/makefile.wat +++ b/contrib/build/xrc/makefile.wat @@ -43,6 +43,11 @@ VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -57,24 +62,61 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG = +__DEBUGINFO = !ifeq BUILD debug -__DEBUGFLAG = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG = !ifeq BUILD debug __OPTIMIZEFLAG = -od @@ -99,15 +141,18 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_HTML_p = !ifeq MONOLITHIC 0 -__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_XML_p = !ifeq MONOLITHIC 0 @@ -119,18 +164,116 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ !endif __xrcdll___depname = !ifeq SHARED 1 -__xrcdll___depname = ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll +__xrcdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll !endif __xrclib___depname = !ifeq SHARED 0 -__xrclib___depname = ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +__xrclib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !endif ### Variables: ### -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\..\src\expat\lib -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch -XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\..\src\expat\lib -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch +LIBDIRNAME = & + ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg & + -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib & + -i=..\..\src\xrc\..\..\..\src\regex & + -i=..\..\src\xrc\..\..\..\src\expat\lib -i=..\..\src\xrc\..\..\include & + -dWXUSINGDLL -dWXMAKINGDLL_XRC $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch +XRCDLL_OBJECTS = & + $(OBJS)\xrcdll_dummy.obj & + $(OBJS)\xrcdll_xmlres.obj & + $(OBJS)\xrcdll_xh_bmp.obj & + $(OBJS)\xrcdll_xh_bmpbt.obj & + $(OBJS)\xrcdll_xh_bttn.obj & + $(OBJS)\xrcdll_xh_cald.obj & + $(OBJS)\xrcdll_xh_chckb.obj & + $(OBJS)\xrcdll_xh_chckl.obj & + $(OBJS)\xrcdll_xh_choic.obj & + $(OBJS)\xrcdll_xh_combo.obj & + $(OBJS)\xrcdll_xh_dlg.obj & + $(OBJS)\xrcdll_xh_frame.obj & + $(OBJS)\xrcdll_xh_gauge.obj & + $(OBJS)\xrcdll_xh_gdctl.obj & + $(OBJS)\xrcdll_xh_html.obj & + $(OBJS)\xrcdll_xh_listb.obj & + $(OBJS)\xrcdll_xh_listc.obj & + $(OBJS)\xrcdll_xh_menu.obj & + $(OBJS)\xrcdll_xh_notbk.obj & + $(OBJS)\xrcdll_xh_panel.obj & + $(OBJS)\xrcdll_xh_radbt.obj & + $(OBJS)\xrcdll_xh_radbx.obj & + $(OBJS)\xrcdll_xh_scrol.obj & + $(OBJS)\xrcdll_xh_scwin.obj & + $(OBJS)\xrcdll_xh_sizer.obj & + $(OBJS)\xrcdll_xh_slidr.obj & + $(OBJS)\xrcdll_xh_spin.obj & + $(OBJS)\xrcdll_xh_split.obj & + $(OBJS)\xrcdll_xh_stbmp.obj & + $(OBJS)\xrcdll_xh_stbox.obj & + $(OBJS)\xrcdll_xh_stlin.obj & + $(OBJS)\xrcdll_xh_sttxt.obj & + $(OBJS)\xrcdll_xh_text.obj & + $(OBJS)\xrcdll_xh_toolb.obj & + $(OBJS)\xrcdll_xh_tree.obj & + $(OBJS)\xrcdll_xh_unkwn.obj & + $(OBJS)\xrcdll_xh_wizrd.obj & + $(OBJS)\xrcdll_xmlrsall.obj +XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg & + -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib & + -i=..\..\src\xrc\..\..\..\src\regex & + -i=..\..\src\xrc\..\..\..\src\expat\lib -i=..\..\src\xrc\..\..\include & + -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_xrclib.pch +XRCLIB_OBJECTS = & + $(OBJS)\xrclib_dummy.obj & + $(OBJS)\xrclib_xmlres.obj & + $(OBJS)\xrclib_xh_bmp.obj & + $(OBJS)\xrclib_xh_bmpbt.obj & + $(OBJS)\xrclib_xh_bttn.obj & + $(OBJS)\xrclib_xh_cald.obj & + $(OBJS)\xrclib_xh_chckb.obj & + $(OBJS)\xrclib_xh_chckl.obj & + $(OBJS)\xrclib_xh_choic.obj & + $(OBJS)\xrclib_xh_combo.obj & + $(OBJS)\xrclib_xh_dlg.obj & + $(OBJS)\xrclib_xh_frame.obj & + $(OBJS)\xrclib_xh_gauge.obj & + $(OBJS)\xrclib_xh_gdctl.obj & + $(OBJS)\xrclib_xh_html.obj & + $(OBJS)\xrclib_xh_listb.obj & + $(OBJS)\xrclib_xh_listc.obj & + $(OBJS)\xrclib_xh_menu.obj & + $(OBJS)\xrclib_xh_notbk.obj & + $(OBJS)\xrclib_xh_panel.obj & + $(OBJS)\xrclib_xh_radbt.obj & + $(OBJS)\xrclib_xh_radbx.obj & + $(OBJS)\xrclib_xh_scrol.obj & + $(OBJS)\xrclib_xh_scwin.obj & + $(OBJS)\xrclib_xh_sizer.obj & + $(OBJS)\xrclib_xh_slidr.obj & + $(OBJS)\xrclib_xh_spin.obj & + $(OBJS)\xrclib_xh_split.obj & + $(OBJS)\xrclib_xh_stbmp.obj & + $(OBJS)\xrclib_xh_stbox.obj & + $(OBJS)\xrclib_xh_stlin.obj & + $(OBJS)\xrclib_xh_sttxt.obj & + $(OBJS)\xrclib_xh_text.obj & + $(OBJS)\xrclib_xh_toolb.obj & + $(OBJS)\xrclib_xh_tree.obj & + $(OBJS)\xrclib_xh_unkwn.obj & + $(OBJS)\xrclib_xh_wizrd.obj & + $(OBJS)\xrclib_xmlrsall.obj @@ -375,28 +518,28 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll - -if exist ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib - -if exist ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib !ifeq SHARED 1 -..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll : $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll : $(XRCDLL_OBJECTS) @%create $(OBJS)\xrcdll.lbc @%append $(OBJS)\xrcdll.lbc option quiet @%append $(OBJS)\xrcdll.lbc name $^@ @%append $(OBJS)\xrcdll.lbc option incremental - @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - @for %i in ( $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj) do @%append $(OBJS)\xrcdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i + @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i @%append $(OBJS)\xrcdll.lbc @%append $(OBJS)\xrcdll.lbc system nt_dll wlink @$(OBJS)\xrcdll.lbc - wlib -q -n -b ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +$^@ + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +$^@ !endif !ifeq SHARED 0 -..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib : $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib : $(XRCLIB_OBJECTS) @%create $(OBJS)\xrclib.lbc - @for %i in ( $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj) do @%append $(OBJS)\xrclib.lbc +%i + @for %i in ($(XRCLIB_OBJECTS)) do @%append $(OBJS)\xrclib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\xrclib.lbc !endif diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in index 20b4d5c9dd..61145ac2de 100644 --- a/contrib/samples/animate/Makefile.in +++ b/contrib/samples/animate/Makefile.in @@ -36,6 +36,9 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS) +ANITEST_OBJECTS = \ + anitest_anitest.o +LIBDIRNAME = $(top_builddir)lib ### Conditionally set variables: ### @@ -44,7 +47,8 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @@ -65,32 +69,36 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ -@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ -@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ -@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ -@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) \ -@COND_TOOLKIT_MAC@ $(__INC_EXPAT_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ -@COND_TOOLKIT_MAC@ $(srcdir)/../../include -o anitest$(EXEEXT) Carbon.r \ -@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ + $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ + $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o anitest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__anitest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @@ -101,8 +109,8 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ all: anitest$(EXEEXT) data -anitest$(EXEEXT): anitest_anitest.o - $(CXX) -o $@ anitest_anitest.o $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +anitest$(EXEEXT): $(ANITEST_OBJECTS) + $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__anitest___mac_rezcmd) $(__anitest___mac_setfilecmd) @@ -111,7 +119,7 @@ anitest_anitest.o: $(srcdir)/anitest.cpp clean: rm -rf ./.deps - rm -f -f ./*.o + rm -f ./*.o rm -f anitest$(EXEEXT) data: diff --git a/contrib/samples/animate/makefile.bcc b/contrib/samples/animate/makefile.bcc index b8cf393f46..96087dd7bf 100644 --- a/contrib/samples/animate/makefile.bcc +++ b/contrib/samples/animate/makefile.bcc @@ -20,13 +20,16 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ +ANITEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ - -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ - -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ - $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) + -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ + -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \ + -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +ANITEST_OBJECTS = \ + $(OBJS)\anitest_anitest.obj +LIBDIRNAME = \ + .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -38,7 +41,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -50,18 +56,36 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = -DWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od !endif @@ -110,9 +134,9 @@ all: $(OBJS)\anitest.exe data $(OBJS)\anitest_anitest.obj: .\anitest.cpp $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) $** -$(OBJS)\anitest.exe: $(OBJS)\anitest_anitest.obj - ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\anitest_anitest.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + c0w32.obj $(ANITEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | clean: diff --git a/contrib/samples/animate/makefile.gcc b/contrib/samples/animate/makefile.gcc index 34bdca8717..2639575ea0 100644 --- a/contrib/samples/animate/makefile.gcc +++ b/contrib/samples/animate/makefile.gcc @@ -12,8 +12,18 @@ include ../../../build/config.gcc ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ + $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +ANITEST_OBJECTS = \ + $(OBJS)\anitest_anitest.o +LIBDIRNAME = \ + .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -27,6 +37,11 @@ ifeq ($(USE_GUI),1) PORTNAME = msw endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -39,17 +54,41 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 endif @@ -63,10 +102,12 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -84,8 +125,8 @@ all: $(OBJS)\anitest.exe data $(OBJS)\anitest_anitest.o: .\anitest.cpp $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $< -$(OBJS)\anitest.exe: $(OBJS)\anitest_anitest.o - $(CXX) -o $@ $(OBJS)\anitest_anitest.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) + $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o diff --git a/contrib/samples/animate/makefile.vc b/contrib/samples/animate/makefile.vc index 2d87a22bd9..5095222155 100644 --- a/contrib/samples/animate/makefile.vc +++ b/contrib/samples/animate/makefile.vc @@ -12,8 +12,19 @@ ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS) -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ANITEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ + /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ + /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS) +ANITEST_OBJECTS = \ + $(OBJS)\anitest_anitest.obj +LIBDIRNAME = \ + .\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -23,7 +34,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -35,30 +49,69 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_0 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_0 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_2 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_2 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_4 = /Od !endif @@ -78,19 +131,36 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_3_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_3_p = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) !endif @@ -105,9 +175,9 @@ all: $(OBJS)\anitest.exe data $(OBJS)\anitest_anitest.obj: .\anitest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) $** -$(OBJS)\anitest.exe: $(OBJS)\anitest_anitest.obj - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\anitest_anitest.obj wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + $(ANITEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << clean: diff --git a/contrib/samples/animate/makefile.wat b/contrib/samples/animate/makefile.wat index 444a2f79d0..9429ef56a7 100644 --- a/contrib/samples/animate/makefile.wat +++ b/contrib/samples/animate/makefile.wat @@ -36,6 +36,11 @@ PORTNAME = msw !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -50,28 +55,65 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG_0 = +__DEBUGINFO_0 = !ifeq BUILD debug -__DEBUGFLAG_0 = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG_0 = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG_2 = !ifeq BUILD debug __OPTIMIZEFLAG_2 = -od @@ -96,11 +138,13 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -109,8 +153,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & + $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) & + -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png & + -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib & + -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) +ANITEST_OBJECTS = & + $(OBJS)\anitest_anitest.obj +LIBDIRNAME = & + .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -125,14 +179,14 @@ all : .SYMBOLIC $(OBJS)\anitest.exe data $(OBJS)\anitest_anitest.obj : .AUTODEPEND .\anitest.cpp $(CXX) -zq -fo=$^@ $(ANITEST_CXXFLAGS) $< -$(OBJS)\anitest.exe : $(OBJS)\anitest_anitest.obj +$(OBJS)\anitest.exe : $(ANITEST_OBJECTS) @%create $(OBJS)\anitest.lbc @%append $(OBJS)\anitest.lbc option quiet @%append $(OBJS)\anitest.lbc name $^@ @%append $(OBJS)\anitest.lbc option incremental - @%append $(OBJS)\anitest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' - @for %i in ( $(OBJS)\anitest_anitest.obj) do @%append $(OBJS)\anitest.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\anitest.lbc library %i + @%append $(OBJS)\anitest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\anitest.lbc library %i @%append $(OBJS)\anitest.lbc wlink @$(OBJS)\anitest.lbc diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index 1b4a09f736..8f3c2fc77f 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -47,7 +47,8 @@ SVGTEST_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL diff --git a/contrib/samples/svg/makefile.bcc b/contrib/samples/svg/makefile.bcc index cb8d831df1..ef238489bf 100644 --- a/contrib/samples/svg/makefile.bcc +++ b/contrib/samples/svg/makefile.bcc @@ -24,7 +24,7 @@ LIBDIRNAME = \ .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ @@ -41,7 +41,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -53,13 +56,22 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(SHARED)" == "1" @@ -128,6 +140,6 @@ clean: -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | diff --git a/contrib/samples/svg/makefile.gcc b/contrib/samples/svg/makefile.gcc index 01ec5eb50b..59545a897e 100644 --- a/contrib/samples/svg/makefile.gcc +++ b/contrib/samples/svg/makefile.gcc @@ -12,20 +12,16 @@ include ../../../build/config.gcc ### Variables: ### -LIBDIRNAME = .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = \ .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \ -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) -SVGTEST_OBJECTS = $(OBJS)\svgtest_svgtest.o SVGTEST_OBJECTS = \ $(OBJS)\svgtest_svgtest.o @@ -41,6 +37,11 @@ ifeq ($(USE_GUI),1) PORTNAME = msw endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -53,12 +54,27 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(SHARED),1) @@ -114,6 +130,6 @@ clean: -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) - $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 + $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 .PHONY: all clean diff --git a/contrib/samples/svg/makefile.vc b/contrib/samples/svg/makefile.vc index a9d45cd64c..66cdc161d1 100644 --- a/contrib/samples/svg/makefile.vc +++ b/contrib/samples/svg/makefile.vc @@ -16,8 +16,8 @@ LIBDIRNAME = \ .\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_3) /DWIN32 \ - $(__DEBUGFLAG_0) $(____DEBUGFLAG_2_p) /Fd$(OBJS)\svgtest.pdb \ +SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ @@ -34,7 +34,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -46,25 +49,55 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_0 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_0 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(SHARED)" == "1" @@ -108,11 +141,26 @@ __WXLIB_MONO_p = \ !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_2_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_2_p = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) !endif @@ -133,6 +181,6 @@ clean: -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< $(SVGTEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat index e51d59f035..f08267b71d 100644 --- a/contrib/samples/svg/makefile.wat +++ b/contrib/samples/svg/makefile.wat @@ -36,6 +36,11 @@ PORTNAME = msw !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -50,22 +55,47 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG_0 = +__DEBUGINFO_0 = !ifeq BUILD debug -__DEBUGFLAG_0 = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG_0 = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 !endif -__DEBUGFLAG_1 = +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __DLLFLAG_p = @@ -127,7 +157,7 @@ LIBDIRNAME = & .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm & +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) & -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png & @@ -161,7 +191,7 @@ $(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) @%append $(OBJS)\svgtest.lbc option quiet @%append $(OBJS)\svgtest.lbc name $^@ @%append $(OBJS)\svgtest.lbc option incremental - @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\svgtest.lbc library %i @%append $(OBJS)\svgtest.lbc diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index 94f5d0d30b..a9de2c1753 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -32,10 +32,17 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + xrcdemo_xrcdemo.o \ + xrcdemo_myframe.o \ + xrcdemo_derivdlg.o \ + xrcdemo_custclas.o \ + $(__xrcdemo___win32rc) ### Conditionally set variables: ### @@ -44,7 +51,8 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @@ -80,34 +88,41 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ -@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ -@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ -@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ -@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) \ -@COND_TOOLKIT_MAC@ $(__INC_EXPAT_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ -@COND_TOOLKIT_MAC@ $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r \ -@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ + $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ + $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_0___WXLIB_HTML_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_MONOLITHIC_0@__WXLIB_XML_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @@ -122,7 +137,7 @@ all: xrcdemo$(EXEEXT) data clean: rm -rf ./.deps - rm -f -f ./*.o + rm -f ./*.o rm -f xrcdemo$(EXEEXT) data: @@ -143,8 +158,8 @@ install-strip: install uninstall: -xrcdemo$(EXEEXT): xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) - $(CXX) -o $@ xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) + $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) diff --git a/contrib/samples/xrc/makefile.bcc b/contrib/samples/xrc/makefile.bcc index d4f89fb9f4..b610f4d996 100644 --- a/contrib/samples/xrc/makefile.bcc +++ b/contrib/samples/xrc/makefile.bcc @@ -20,15 +20,21 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +LIBDIRNAME = \ + .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ - -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ - -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ - $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) + -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ + -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \ + -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + $(OBJS)\xrcdemo_xrcdemo.obj \ + $(OBJS)\xrcdemo_myframe.obj \ + $(OBJS)\xrcdemo_derivdlg.obj \ + $(OBJS)\xrcdemo_custclas.obj ### Conditionally set variables: ### @@ -38,7 +44,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -50,16 +59,28 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "1" @@ -68,6 +89,15 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od !endif @@ -107,6 +137,9 @@ __WXLIB_HTML_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib +!endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif @@ -136,7 +169,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -147,7 +180,7 @@ data: if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res - ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res +$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res | diff --git a/contrib/samples/xrc/makefile.gcc b/contrib/samples/xrc/makefile.gcc index cb39fc148d..3d1b00f5de 100644 --- a/contrib/samples/xrc/makefile.gcc +++ b/contrib/samples/xrc/makefile.gcc @@ -12,8 +12,22 @@ include ../../../build/config.gcc ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ + $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + $(OBJS)\xrcdemo_xrcdemo.o \ + $(OBJS)\xrcdemo_myframe.o \ + $(OBJS)\xrcdemo_derivdlg.o \ + $(OBJS)\xrcdemo_custclas.o \ + $(OBJS)\xrcdemo_xrcdemo_rc.o ### Conditionally set variables: ### @@ -27,6 +41,11 @@ ifeq ($(USE_GUI),1) PORTNAME = msw endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -39,15 +58,35 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p_1 = --define __WXDEBUG__ endif ifeq ($(SHARED),1) @@ -56,6 +95,15 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 endif @@ -72,13 +120,19 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),0) -__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +__WXLIB_HTML_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -109,7 +163,7 @@ $(OBJS)\xrcdemo_xrcdemo.o: .\xrcdemo.cpp $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< $(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o @@ -119,7 +173,7 @@ data: if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%%f copy ./rc\%%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o - $(CXX) -o $@ $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o + $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 .PHONY: all clean diff --git a/contrib/samples/xrc/makefile.vc b/contrib/samples/xrc/makefile.vc index a2f9e507a6..cf150e547c 100644 --- a/contrib/samples/xrc/makefile.vc +++ b/contrib/samples/xrc/makefile.vc @@ -12,8 +12,23 @@ ### Variables: ### -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ + /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ + /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + $(OBJS)\xrcdemo_xrcdemo.obj \ + $(OBJS)\xrcdemo_myframe.obj \ + $(OBJS)\xrcdemo_derivdlg.obj \ + $(OBJS)\xrcdemo_custclas.obj \ + $(OBJS)\xrcdemo_xrcdemo.res ### Conditionally set variables: ### @@ -23,7 +38,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -35,35 +53,77 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_0 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_0 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_2 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_2 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif -!if "$(BUILD)" == "debug" -__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif !if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /dWXUSINGDLL +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_4 = /Od @@ -81,37 +141,73 @@ __RUNTIME_LIBS_7 = T __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1 !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_3_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_3_p = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /DNDEBUG !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_3_p_1 = /d_DEBUG +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p = /DNDEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_3_p_1 = /dNDEBUG +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p_1 = /d NDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p_1 = /d NDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p_1 = /d _DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p_1 = /d NDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p_1 = /d _DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1) !endif @@ -136,7 +232,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc - rc /fo$@ /dWIN32 $(____DEBUGFLAG_3_p_1) /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i.\..\..\..\src\expat\lib /i. $(__DLLFLAG_p_1) /d_WINDOWS /i.\..\..\include $** + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\include $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -147,7 +243,7 @@ data: if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + $(XRCDEMO_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/contrib/samples/xrc/makefile.wat b/contrib/samples/xrc/makefile.wat index 5c5e99b6ad..df430313f0 100644 --- a/contrib/samples/xrc/makefile.wat +++ b/contrib/samples/xrc/makefile.wat @@ -36,6 +36,11 @@ PORTNAME = msw !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -50,28 +55,65 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG_0 = +__DEBUGINFO_0 = !ifeq BUILD debug -__DEBUGFLAG_0 = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG_0 = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG_2 = !ifeq BUILD debug __OPTIMIZEFLAG_2 = -od @@ -96,15 +138,22 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_HTML_p = !ifeq MONOLITHIC 0 -__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -113,8 +162,21 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) +LIBDIRNAME = & + .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & + $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) & + -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png & + -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib & + -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = & + $(OBJS)\xrcdemo_xrcdemo.obj & + $(OBJS)\xrcdemo_myframe.obj & + $(OBJS)\xrcdemo_derivdlg.obj & + $(OBJS)\xrcdemo_custclas.obj @@ -139,7 +201,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< $(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $< + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $< clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -152,13 +214,13 @@ data : if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe : $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res +$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res @%create $(OBJS)\xrcdemo.lbc @%append $(OBJS)\xrcdemo.lbc option quiet @%append $(OBJS)\xrcdemo.lbc name $^@ @%append $(OBJS)\xrcdemo.lbc option incremental - @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' - @for %i in ( $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj) do @%append $(OBJS)\xrcdemo.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\xrcdemo.lbc library %i + @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\xrcdemo.lbc library %i @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res wlink @$(OBJS)\xrcdemo.lbc diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 7b9d9249c3..47f0ba1fd0 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -46,10 +46,15 @@ ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) \ $(PIC_FLAG) +ANIMATEDLL_OBJECTS = \ + animatedll_animate.o ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include $(CXXFLAGS) +ANIMATELIB_OBJECTS = \ + animatelib_animate.o +LIBDIRNAME = $(top_builddir)lib ### Conditionally set variables: ### @@ -63,7 +68,8 @@ ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -79,59 +85,68 @@ ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__animatedll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) -@COND_PLATFORM_WIN32_1@__animatedll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__animatedll___macinstnamecmd \ -@COND_PLATFORM_MACOSX_1@ = -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) +COND_SHARED_1___animatedll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) +@COND_SHARED_1@__animatedll___depname = $(COND_SHARED_1___animatedll___depname) +COND_PLATFORM_WIN32_1___animatedll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__animatedll___importlib = $(COND_PLATFORM_WIN32_1___animatedll___importlib) +COND_PLATFORM_MACOSX_1___animatedll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__animatedll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___animatedll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__animatedll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_cmd \ -@COND_USE_SOSYMLINKS_1@ = (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__animatedll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__animatedll___soname_flags \ -@COND_USE_SOVERSOLARIS_1@ = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) +COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \ + -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___animatedll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) +@COND_USE_SOVERLINUX_1@__animatedll___soname_flags = $(COND_USE_SOVERLINUX_1___animatedll___soname_flags) +COND_USE_SOVERSOLARIS_1___animatedll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__animatedll___soname_flags = $(COND_USE_SOVERSOLARIS_1___animatedll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf2 \ @@ -142,8 +157,9 @@ ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__animatedll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__animatelib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a +COND_SHARED_0___animatelib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__animatelib___depname = $(COND_SHARED_0___animatelib___depname) @COND_SHARED_1@__install_animatedll___depname = install_animatedll @COND_SHARED_0@__install_animatelib___depname = install_animatelib @@ -151,16 +167,16 @@ ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ all: $(__animatedll___depname) $(__animatelib___depname) -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): animatedll_animate.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ animatedll_animate.o $(LDFLAGS) -L$(top_builddir)lib $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(__animatedll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(ANIMATEDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(__animatedll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__animatedll___so_symlinks_cmd) animatedll_animate.o: $(srcdir)/animate.cpp $(CXXC) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: animatelib_animate.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: $(ANIMATELIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ animatelib_animate.o +@COND_SHARED_0@ $(AR) rcu $@ $(ANIMATELIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ animatelib_animate.o: $(srcdir)/animate.cpp @@ -168,11 +184,11 @@ animatelib_animate.o: $(srcdir)/animate.cpp clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -192,13 +208,13 @@ install-strip: install @COND_SHARED_1@install_animatedll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__animatedll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_animatelib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index c5cea1edca..29586a484a 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -46,10 +46,47 @@ FLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) \ $(PIC_FLAG) +FLDLL_OBJECTS = \ + fldll_antiflickpl.o \ + fldll_bardragpl.o \ + fldll_barhintspl.o \ + fldll_cbcustom.o \ + fldll_controlbar.o \ + fldll_dyntbar.o \ + fldll_dyntbarhnd.o \ + fldll_frmview.o \ + fldll_garbagec.o \ + fldll_gcupdatesmgr.o \ + fldll_hintanimpl.o \ + fldll_newbmpbtn.o \ + fldll_panedrawpl.o \ + fldll_rowdragpl.o \ + fldll_rowlayoutpl.o \ + fldll_toolwnd.o \ + fldll_updatesmgr.o FLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include $(CXXFLAGS) +FLLIB_OBJECTS = \ + fllib_antiflickpl.o \ + fllib_bardragpl.o \ + fllib_barhintspl.o \ + fllib_cbcustom.o \ + fllib_controlbar.o \ + fllib_dyntbar.o \ + fllib_dyntbarhnd.o \ + fllib_frmview.o \ + fllib_garbagec.o \ + fllib_gcupdatesmgr.o \ + fllib_hintanimpl.o \ + fllib_newbmpbtn.o \ + fllib_panedrawpl.o \ + fllib_rowdragpl.o \ + fllib_rowlayoutpl.o \ + fllib_toolwnd.o \ + fllib_updatesmgr.o +LIBDIRNAME = $(top_builddir)lib ### Conditionally set variables: ### @@ -63,7 +100,8 @@ FLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -79,58 +117,67 @@ FLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__fldll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) -@COND_PLATFORM_WIN32_1@__fldll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = \ -@COND_PLATFORM_MACOSX_1@ -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) +COND_SHARED_1___fldll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) +@COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname) +COND_PLATFORM_WIN32_1___fldll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__fldll___importlib = $(COND_PLATFORM_WIN32_1___fldll___importlib) +COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__fldll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = \ -@COND_USE_SOSYMLINKS_1@ (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__fldll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) +COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___fldll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) +@COND_USE_SOVERLINUX_1@__fldll___soname_flags = $(COND_USE_SOVERLINUX_1___fldll___soname_flags) +COND_USE_SOVERSOLARIS_1___fldll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___fldll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 \ @@ -141,8 +188,9 @@ FLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__fllib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a +COND_SHARED_0___fllib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname) @COND_SHARED_1@__install_fldll___depname = install_fldll @COND_SHARED_0@__install_fllib___depname = install_fllib @@ -152,18 +200,18 @@ all: $(__fldll___depname) $(__fllib___depname) clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): fldll_antiflickpl.o fldll_bardragpl.o fldll_barhintspl.o fldll_cbcustom.o fldll_controlbar.o fldll_dyntbar.o fldll_dyntbarhnd.o fldll_frmview.o fldll_garbagec.o fldll_gcupdatesmgr.o fldll_hintanimpl.o fldll_newbmpbtn.o fldll_panedrawpl.o fldll_rowdragpl.o fldll_rowlayoutpl.o fldll_toolwnd.o fldll_updatesmgr.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ fldll_antiflickpl.o fldll_bardragpl.o fldll_barhintspl.o fldll_cbcustom.o fldll_controlbar.o fldll_dyntbar.o fldll_dyntbarhnd.o fldll_frmview.o fldll_garbagec.o fldll_gcupdatesmgr.o fldll_hintanimpl.o fldll_newbmpbtn.o fldll_panedrawpl.o fldll_rowdragpl.o fldll_rowlayoutpl.o fldll_toolwnd.o fldll_updatesmgr.o $(LDFLAGS) -L$(top_builddir)lib $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(__fldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(__fldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__fldll___so_symlinks_cmd) fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp @@ -217,9 +265,9 @@ fldll_toolwnd.o: $(srcdir)/toolwnd.cpp fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: fllib_antiflickpl.o fllib_bardragpl.o fllib_barhintspl.o fllib_cbcustom.o fllib_controlbar.o fllib_dyntbar.o fllib_dyntbarhnd.o fllib_frmview.o fllib_garbagec.o fllib_gcupdatesmgr.o fllib_hintanimpl.o fllib_newbmpbtn.o fllib_panedrawpl.o fllib_rowdragpl.o fllib_rowlayoutpl.o fllib_toolwnd.o fllib_updatesmgr.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: $(FLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ fllib_antiflickpl.o fllib_bardragpl.o fllib_barhintspl.o fllib_cbcustom.o fllib_controlbar.o fllib_dyntbar.o fllib_dyntbarhnd.o fllib_frmview.o fllib_garbagec.o fllib_gcupdatesmgr.o fllib_hintanimpl.o fllib_newbmpbtn.o fllib_panedrawpl.o fllib_rowdragpl.o fllib_rowlayoutpl.o fllib_toolwnd.o fllib_updatesmgr.o +@COND_SHARED_0@ $(AR) rcu $@ $(FLLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ fllib_antiflickpl.o: $(srcdir)/antiflickpl.cpp @@ -287,13 +335,13 @@ install-strip: install @COND_SHARED_1@install_fldll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__fldll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_fllib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 857d1da5a9..b487dfd0c3 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -46,10 +46,25 @@ GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) \ $(PIC_FLAG) +GIZMOSDLL_OBJECTS = \ + gizmosdll_dynamicsash.o \ + gizmosdll_editlbox.o \ + gizmosdll_ledctrl.o \ + gizmosdll_multicell.o \ + gizmosdll_splittree.o \ + gizmosdll_statpict.o GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include $(CXXFLAGS) +GIZMOSLIB_OBJECTS = \ + gizmoslib_dynamicsash.o \ + gizmoslib_editlbox.o \ + gizmoslib_ledctrl.o \ + gizmoslib_multicell.o \ + gizmoslib_splittree.o \ + gizmoslib_statpict.o +LIBDIRNAME = $(top_builddir)lib ### Conditionally set variables: ### @@ -63,7 +78,8 @@ GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -79,59 +95,67 @@ GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__gizmosdll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd \ -@COND_PLATFORM_MACOSX_1@ = -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) +COND_SHARED_1___gizmosdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) +@COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname) +COND_PLATFORM_WIN32_1___gizmosdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = $(COND_PLATFORM_WIN32_1___gizmosdll___importlib) +COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__gizmosdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd \ -@COND_USE_SOSYMLINKS_1@ = (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags \ -@COND_USE_SOVERSOLARIS_1@ = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) +COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___gizmosdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmosdll___soname_flags) +COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf2 \ @@ -142,8 +166,9 @@ GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__gizmoslib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a +COND_SHARED_0___gizmoslib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__gizmoslib___depname = $(COND_SHARED_0___gizmoslib___depname) @COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll @COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib @@ -153,18 +178,18 @@ all: $(__gizmosdll___depname) $(__gizmoslib___depname) clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o $(LDFLAGS) -L$(top_builddir)lib $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(GIZMOSDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) @COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd) gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp @@ -185,9 +210,9 @@ gizmosdll_splittree.o: $(srcdir)/splittree.cpp gizmosdll_statpict.o: $(srcdir)/statpict.cpp $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: gizmoslib_dynamicsash.o gizmoslib_editlbox.o gizmoslib_ledctrl.o gizmoslib_multicell.o gizmoslib_splittree.o gizmoslib_statpict.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: $(GIZMOSLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ gizmoslib_dynamicsash.o gizmoslib_editlbox.o gizmoslib_ledctrl.o gizmoslib_multicell.o gizmoslib_splittree.o gizmoslib_statpict.o +@COND_SHARED_0@ $(AR) rcu $@ $(GIZMOSLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ gizmoslib_dynamicsash.o: $(srcdir)/dynamicsash.cpp @@ -222,13 +247,13 @@ install-strip: install @COND_SHARED_1@install_gizmosdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_gizmoslib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 6f8b7246e7..54024c3ed6 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -41,15 +41,42 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib OGLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL \ - -DwxUSE_DEPRECATED=0 $(CXXFLAGS) $(PIC_FLAG) + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) \ + $(PIC_FLAG) +OGLDLL_OBJECTS = \ + ogldll_basic2.o \ + ogldll_canvas.o \ + ogldll_divided.o \ + ogldll_mfutils.o \ + ogldll_oglmisc.o \ + ogldll_basic.o \ + ogldll_composit.o \ + ogldll_drawn.o \ + ogldll_bmpshape.o \ + ogldll_constrnt.o \ + ogldll_lines.o \ + ogldll_ogldiag.o OGLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include $(CXXFLAGS) +OGLLIB_OBJECTS = \ + ogllib_basic2.o \ + ogllib_canvas.o \ + ogllib_divided.o \ + ogllib_mfutils.o \ + ogllib_oglmisc.o \ + ogllib_basic.o \ + ogllib_composit.o \ + ogllib_drawn.o \ + ogllib_bmpshape.o \ + ogllib_constrnt.o \ + ogllib_lines.o \ + ogllib_ogldiag.o ### Conditionally set variables: ### @@ -63,7 +90,8 @@ OGLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -79,60 +107,69 @@ OGLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_ogldll___depname = install_ogldll @COND_SHARED_0@__install_ogllib___depname = install_ogllib -@COND_SHARED_1@__ogldll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) -@COND_PLATFORM_WIN32_1@__ogldll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = \ -@COND_PLATFORM_MACOSX_1@ -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) +COND_SHARED_1___ogldll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) +@COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname) +COND_PLATFORM_WIN32_1___ogldll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__ogldll___importlib = $(COND_PLATFORM_WIN32_1___ogldll___importlib) +COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__ogldll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = \ -@COND_USE_SOSYMLINKS_1@ (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__ogldll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) +COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___ogldll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) +@COND_USE_SOVERLINUX_1@__ogldll___soname_flags = $(COND_USE_SOVERLINUX_1___ogldll___soname_flags) +COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___ogldll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \ @@ -143,8 +180,9 @@ OGLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__ogllib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a +COND_SHARED_0___ogllib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname) ### Targets: ### @@ -152,11 +190,11 @@ all: $(__ogldll___depname) $(__ogllib___depname) clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -176,16 +214,16 @@ install-strip: install @COND_SHARED_1@install_ogldll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__ogldll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_ogllib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): ogldll_basic2.o ogldll_canvas.o ogldll_divided.o ogldll_mfutils.o ogldll_oglmisc.o ogldll_basic.o ogldll_composit.o ogldll_drawn.o ogldll_bmpshape.o ogldll_constrnt.o ogldll_lines.o ogldll_ogldiag.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ ogldll_basic2.o ogldll_canvas.o ogldll_divided.o ogldll_mfutils.o ogldll_oglmisc.o ogldll_basic.o ogldll_composit.o ogldll_drawn.o ogldll_bmpshape.o ogldll_constrnt.o ogldll_lines.o ogldll_ogldiag.o $(LDFLAGS) -L$(top_builddir)lib $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__ogldll___so_symlinks_cmd) ogldll_basic.o: $(srcdir)/basic.cpp @@ -224,9 +262,9 @@ ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: ogllib_basic2.o ogllib_canvas.o ogllib_divided.o ogllib_mfutils.o ogllib_oglmisc.o ogllib_basic.o ogllib_composit.o ogllib_drawn.o ogllib_bmpshape.o ogllib_constrnt.o ogllib_lines.o ogllib_ogldiag.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(OGLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ ogllib_basic2.o ogllib_canvas.o ogllib_divided.o ogllib_mfutils.o ogllib_oglmisc.o ogllib_basic.o ogllib_composit.o ogllib_drawn.o ogllib_bmpshape.o ogllib_constrnt.o ogllib_lines.o ogllib_ogldiag.o +@COND_SHARED_0@ $(AR) rcu $@ $(OGLLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ ogllib_basic.o: $(srcdir)/basic.cpp diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index d146e629a5..5e51959bb0 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -41,17 +41,118 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \ -DWXMAKINGDLL_STC $(CXXFLAGS) $(PIC_FLAG) +STCDLL_OBJECTS = \ + stcdll_PlatWX.o \ + stcdll_ScintillaWX.o \ + stcdll_stc.o \ + stcdll_AutoComplete.o \ + stcdll_CallTip.o \ + stcdll_CellBuffer.o \ + stcdll_ContractionState.o \ + stcdll_Document.o \ + stcdll_DocumentAccessor.o \ + stcdll_Editor.o \ + stcdll_ExternalLexer.o \ + stcdll_Indicator.o \ + stcdll_KeyMap.o \ + stcdll_KeyWords.o \ + stcdll_LexAVE.o \ + stcdll_LexAda.o \ + stcdll_LexAsm.o \ + stcdll_LexBaan.o \ + stcdll_LexBullant.o \ + stcdll_LexCPP.o \ + stcdll_LexCSS.o \ + stcdll_LexConf.o \ + stcdll_LexCrontab.o \ + stcdll_LexEiffel.o \ + stcdll_LexEScript.o \ + stcdll_LexFortran.o \ + stcdll_LexHTML.o \ + stcdll_LexLisp.o \ + stcdll_LexLout.o \ + stcdll_LexLua.o \ + stcdll_LexMatlab.o \ + stcdll_LexOthers.o \ + stcdll_LexPOV.o \ + stcdll_LexPascal.o \ + stcdll_LexPerl.o \ + stcdll_LexPython.o \ + stcdll_LexRuby.o \ + stcdll_LexSQL.o \ + stcdll_LexVB.o \ + stcdll_LineMarker.o \ + stcdll_PropSet.o \ + stcdll_RESearch.o \ + stcdll_ScintillaBase.o \ + stcdll_Style.o \ + stcdll_StyleContext.o \ + stcdll_UniConversion.o \ + stcdll_ViewStyle.o \ + stcdll_WindowAccessor.o \ + stcdll_XPM.o STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) +STCLIB_OBJECTS = \ + stclib_PlatWX.o \ + stclib_ScintillaWX.o \ + stclib_stc.o \ + stclib_AutoComplete.o \ + stclib_CallTip.o \ + stclib_CellBuffer.o \ + stclib_ContractionState.o \ + stclib_Document.o \ + stclib_DocumentAccessor.o \ + stclib_Editor.o \ + stclib_ExternalLexer.o \ + stclib_Indicator.o \ + stclib_KeyMap.o \ + stclib_KeyWords.o \ + stclib_LexAVE.o \ + stclib_LexAda.o \ + stclib_LexAsm.o \ + stclib_LexBaan.o \ + stclib_LexBullant.o \ + stclib_LexCPP.o \ + stclib_LexCSS.o \ + stclib_LexConf.o \ + stclib_LexCrontab.o \ + stclib_LexEiffel.o \ + stclib_LexEScript.o \ + stclib_LexFortran.o \ + stclib_LexHTML.o \ + stclib_LexLisp.o \ + stclib_LexLout.o \ + stclib_LexLua.o \ + stclib_LexMatlab.o \ + stclib_LexOthers.o \ + stclib_LexPOV.o \ + stclib_LexPascal.o \ + stclib_LexPerl.o \ + stclib_LexPython.o \ + stclib_LexRuby.o \ + stclib_LexSQL.o \ + stclib_LexVB.o \ + stclib_LineMarker.o \ + stclib_PropSet.o \ + stclib_RESearch.o \ + stclib_ScintillaBase.o \ + stclib_Style.o \ + stclib_StyleContext.o \ + stclib_UniConversion.o \ + stclib_ViewStyle.o \ + stclib_WindowAccessor.o \ + stclib_XPM.o ### Conditionally set variables: ### @@ -65,7 +166,8 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -81,60 +183,69 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_stcdll___depname = install_stcdll @COND_SHARED_0@__install_stclib___depname = install_stclib -@COND_SHARED_1@__stcdll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__stcdll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = \ -@COND_PLATFORM_MACOSX_1@ -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) +COND_SHARED_1___stcdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) +@COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname) +COND_PLATFORM_WIN32_1___stcdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib) +COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__stcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = \ -@COND_USE_SOSYMLINKS_1@ (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) +COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___stcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags) +COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf2 \ @@ -145,8 +256,9 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__stclib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a +COND_SHARED_0___stclib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__stclib___depname = $(COND_SHARED_0___stclib___depname) ### Targets: ### @@ -154,11 +266,11 @@ all: $(__stcdll___depname) $(__stclib___depname) clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -178,16 +290,16 @@ install-strip: install @COND_SHARED_1@install_stcdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_stclib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_ExternalLexer.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexEScript.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLout.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_ExternalLexer.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexEScript.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLout.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o $(LDFLAGS) -L$(top_builddir)lib $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__stcdll___so_symlinks_cmd) stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx @@ -337,9 +449,9 @@ stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx stcdll_stc.o: $(srcdir)/stc.cpp $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: stclib_PlatWX.o stclib_ScintillaWX.o stclib_stc.o stclib_AutoComplete.o stclib_CallTip.o stclib_CellBuffer.o stclib_ContractionState.o stclib_Document.o stclib_DocumentAccessor.o stclib_Editor.o stclib_ExternalLexer.o stclib_Indicator.o stclib_KeyMap.o stclib_KeyWords.o stclib_LexAVE.o stclib_LexAda.o stclib_LexAsm.o stclib_LexBaan.o stclib_LexBullant.o stclib_LexCPP.o stclib_LexCSS.o stclib_LexConf.o stclib_LexCrontab.o stclib_LexEiffel.o stclib_LexEScript.o stclib_LexFortran.o stclib_LexHTML.o stclib_LexLisp.o stclib_LexLout.o stclib_LexLua.o stclib_LexMatlab.o stclib_LexOthers.o stclib_LexPOV.o stclib_LexPascal.o stclib_LexPerl.o stclib_LexPython.o stclib_LexRuby.o stclib_LexSQL.o stclib_LexVB.o stclib_LineMarker.o stclib_PropSet.o stclib_RESearch.o stclib_ScintillaBase.o stclib_Style.o stclib_StyleContext.o stclib_UniConversion.o stclib_ViewStyle.o stclib_WindowAccessor.o stclib_XPM.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: $(STCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ stclib_PlatWX.o stclib_ScintillaWX.o stclib_stc.o stclib_AutoComplete.o stclib_CallTip.o stclib_CellBuffer.o stclib_ContractionState.o stclib_Document.o stclib_DocumentAccessor.o stclib_Editor.o stclib_ExternalLexer.o stclib_Indicator.o stclib_KeyMap.o stclib_KeyWords.o stclib_LexAVE.o stclib_LexAda.o stclib_LexAsm.o stclib_LexBaan.o stclib_LexBullant.o stclib_LexCPP.o stclib_LexCSS.o stclib_LexConf.o stclib_LexCrontab.o stclib_LexEiffel.o stclib_LexEScript.o stclib_LexFortran.o stclib_LexHTML.o stclib_LexLisp.o stclib_LexLout.o stclib_LexLua.o stclib_LexMatlab.o stclib_LexOthers.o stclib_LexPOV.o stclib_LexPascal.o stclib_LexPerl.o stclib_LexPython.o stclib_LexRuby.o stclib_LexSQL.o stclib_LexVB.o stclib_LineMarker.o stclib_PropSet.o stclib_RESearch.o stclib_ScintillaBase.o stclib_Style.o stclib_StyleContext.o stclib_UniConversion.o stclib_ViewStyle.o stclib_WindowAccessor.o stclib_XPM.o +@COND_SHARED_0@ $(AR) rcu $@ $(STCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ stclib_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 6ed1666270..33a21aafc7 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -68,7 +68,8 @@ SVGLIB_OBJECTS = \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index c6915484e9..31332a0c94 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -41,16 +41,93 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib XRCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) \ $(PIC_FLAG) +XRCDLL_OBJECTS = \ + xrcdll_xmlres.o \ + xrcdll_xh_bmp.o \ + xrcdll_xh_bmpbt.o \ + xrcdll_xh_bttn.o \ + xrcdll_xh_cald.o \ + xrcdll_xh_chckb.o \ + xrcdll_xh_chckl.o \ + xrcdll_xh_choic.o \ + xrcdll_xh_combo.o \ + xrcdll_xh_dlg.o \ + xrcdll_xh_frame.o \ + xrcdll_xh_gauge.o \ + xrcdll_xh_gdctl.o \ + xrcdll_xh_html.o \ + xrcdll_xh_listb.o \ + xrcdll_xh_listc.o \ + xrcdll_xh_menu.o \ + xrcdll_xh_notbk.o \ + xrcdll_xh_panel.o \ + xrcdll_xh_radbt.o \ + xrcdll_xh_radbx.o \ + xrcdll_xh_scrol.o \ + xrcdll_xh_scwin.o \ + xrcdll_xh_sizer.o \ + xrcdll_xh_slidr.o \ + xrcdll_xh_spin.o \ + xrcdll_xh_split.o \ + xrcdll_xh_stbmp.o \ + xrcdll_xh_stbox.o \ + xrcdll_xh_stlin.o \ + xrcdll_xh_sttxt.o \ + xrcdll_xh_text.o \ + xrcdll_xh_toolb.o \ + xrcdll_xh_tree.o \ + xrcdll_xh_unkwn.o \ + xrcdll_xh_wizrd.o \ + xrcdll_xmlrsall.o XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse \ -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCLIB_OBJECTS = \ + xrclib_xmlres.o \ + xrclib_xh_bmp.o \ + xrclib_xh_bmpbt.o \ + xrclib_xh_bttn.o \ + xrclib_xh_cald.o \ + xrclib_xh_chckb.o \ + xrclib_xh_chckl.o \ + xrclib_xh_choic.o \ + xrclib_xh_combo.o \ + xrclib_xh_dlg.o \ + xrclib_xh_frame.o \ + xrclib_xh_gauge.o \ + xrclib_xh_gdctl.o \ + xrclib_xh_html.o \ + xrclib_xh_listb.o \ + xrclib_xh_listc.o \ + xrclib_xh_menu.o \ + xrclib_xh_notbk.o \ + xrclib_xh_panel.o \ + xrclib_xh_radbt.o \ + xrclib_xh_radbx.o \ + xrclib_xh_scrol.o \ + xrclib_xh_scwin.o \ + xrclib_xh_sizer.o \ + xrclib_xh_slidr.o \ + xrclib_xh_spin.o \ + xrclib_xh_split.o \ + xrclib_xh_stbmp.o \ + xrclib_xh_stbox.o \ + xrclib_xh_stlin.o \ + xrclib_xh_sttxt.o \ + xrclib_xh_text.o \ + xrclib_xh_toolb.o \ + xrclib_xh_tree.o \ + xrclib_xh_unkwn.o \ + xrclib_xh_wizrd.o \ + xrclib_xmlrsall.o ### Conditionally set variables: ### @@ -64,7 +141,8 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -80,64 +158,74 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_0___WXLIB_HTML_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_SHARED_1@__xrcdll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = \ -@COND_PLATFORM_MACOSX_1@ -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +COND_SHARED_1___xrcdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_SHARED_1@__xrcdll___depname = $(COND_SHARED_1___xrcdll___depname) +COND_PLATFORM_WIN32_1___xrcdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib) +COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__xrcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = \ -@COND_USE_SOSYMLINKS_1@ (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags) +COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 \ @@ -148,8 +236,9 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__xrclib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a +COND_SHARED_0___xrclib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__xrclib___depname = $(COND_SHARED_0___xrclib___depname) ### Targets: ### @@ -157,11 +246,11 @@ all: $(__xrcdll___depname) $(__xrclib___depname) clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -181,18 +270,18 @@ install-strip: install @COND_SHARED_1@install_xrcdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_xrclib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) uninstall: -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o $(LDFLAGS) -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp @@ -306,9 +395,9 @@ xrcdll_xmlres.o: $(srcdir)/xmlres.cpp xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o +@COND_SHARED_0@ $(AR) rcu $@ $(XRCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp diff --git a/contrib/utils/wxrc/Makefile.in b/contrib/utils/wxrc/Makefile.in index 77d05008ab..fc0eb56866 100644 --- a/contrib/utils/wxrc/Makefile.in +++ b/contrib/utils/wxrc/Makefile.in @@ -28,10 +28,13 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = \ + wxrc_wxrc.o ### Conditionally set variables: ### @@ -40,7 +43,8 @@ WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @@ -53,22 +57,26 @@ WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -81,7 +89,7 @@ all: wxrc$(EXEEXT) clean: rm -rf ./.deps - rm -f -f ./*.o + rm -f ./*.o rm -f wxrc$(EXEEXT) distclean: clean @@ -94,8 +102,8 @@ install-strip: install uninstall: -wxrc$(EXEEXT): wxrc_wxrc.o - $(CXX) -o $@ wxrc_wxrc.o $(LDFLAGS) -L$(top_builddir)lib $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +wxrc$(EXEEXT): $(WXRC_OBJECTS) + $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wxrc___mac_setfilecmd) diff --git a/contrib/utils/wxrc/makefile.bcc b/contrib/utils/wxrc/makefile.bcc index cb0ddf6e84..4c4bb99cda 100644 --- a/contrib/utils/wxrc/makefile.bcc +++ b/contrib/utils/wxrc/makefile.bcc @@ -20,15 +20,18 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +LIBDIRNAME = \ + .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ +WXRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ - -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ - -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ - $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXFLAGS) + -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ + -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \ + -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = \ + $(OBJS)\wxrc_wxrc.obj ### Conditionally set variables: ### @@ -38,7 +41,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -50,18 +56,36 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = -DWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od !endif @@ -114,7 +138,7 @@ clean: -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe: $(OBJS)\wxrc_wxrc.obj - ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ap @&&| - c0x32.obj $(OBJS)\wxrc_wxrc.obj,$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | diff --git a/contrib/utils/wxrc/makefile.gcc b/contrib/utils/wxrc/makefile.gcc index 19b62f9679..3b2c7e5f0f 100644 --- a/contrib/utils/wxrc/makefile.gcc +++ b/contrib/utils/wxrc/makefile.gcc @@ -12,8 +12,18 @@ include ../../../build/config.gcc ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ + $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = \ + $(OBJS)\wxrc_wxrc.o ### Conditionally set variables: ### @@ -27,6 +37,11 @@ ifeq ($(USE_GUI),1) PORTNAME = msw endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -39,17 +54,41 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 endif @@ -63,7 +102,8 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) __WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml @@ -88,7 +128,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe: $(OBJS)\wxrc_wxrc.o - $(CXX) -o $@ $(OBJS)\wxrc_wxrc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) + $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 .PHONY: all clean diff --git a/contrib/utils/wxrc/makefile.vc b/contrib/utils/wxrc/makefile.vc index 960cddccab..af75132f49 100644 --- a/contrib/utils/wxrc/makefile.vc +++ b/contrib/utils/wxrc/makefile.vc @@ -12,8 +12,19 @@ ### Variables: ### -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ + /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ + /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \ + $(__DLLFLAG_p) /D_CONSOLE $(CXXFLAGS) +WXRC_OBJECTS = \ + $(OBJS)\wxrc_wxrc.obj ### Conditionally set variables: ### @@ -23,7 +34,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -35,30 +49,69 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_0 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_0 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_2 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_2 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_4 = /Od !endif @@ -78,7 +131,8 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib @@ -86,11 +140,26 @@ __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_3_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_3_p = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) !endif @@ -110,7 +179,7 @@ clean: -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe: $(OBJS)\wxrc_wxrc.obj - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:CONSOLE @<< - $(OBJS)\wxrc_wxrc.obj $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/contrib/utils/wxrc/makefile.wat b/contrib/utils/wxrc/makefile.wat index ad096e43f2..d82c7eeb41 100644 --- a/contrib/utils/wxrc/makefile.wat +++ b/contrib/utils/wxrc/makefile.wat @@ -36,6 +36,11 @@ PORTNAME = msw !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -50,28 +55,65 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG_0 = +__DEBUGINFO_0 = !ifeq BUILD debug -__DEBUGFLAG_0 = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG_0 = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG_2 = !ifeq BUILD debug __OPTIMIZEFLAG_2 = -od @@ -96,7 +138,8 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_XML_p = !ifeq MONOLITHIC 0 @@ -109,8 +152,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CXXFLAGS) +LIBDIRNAME = & + .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & + $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) & + -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png & + -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib & + -i=. $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = & + $(OBJS)\wxrc_wxrc.obj @@ -132,13 +185,13 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe : $(OBJS)\wxrc_wxrc.obj +$(OBJS)\wxrc.exe : $(WXRC_OBJECTS) @%create $(OBJS)\wxrc.lbc @%append $(OBJS)\wxrc.lbc option quiet @%append $(OBJS)\wxrc.lbc name $^@ @%append $(OBJS)\wxrc.lbc option incremental - @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt ref 'main_' - @for %i in ( $(OBJS)\wxrc_wxrc.obj) do @%append $(OBJS)\wxrc.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\wxrc.lbc library %i + @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\wxrc.lbc library %i @%append $(OBJS)\wxrc.lbc wlink @$(OBJS)\wxrc.lbc diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 1b4a09f736..8f3c2fc77f 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -47,7 +47,8 @@ SVGTEST_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc index cb8d831df1..ef238489bf 100644 --- a/samples/svg/makefile.bcc +++ b/samples/svg/makefile.bcc @@ -24,7 +24,7 @@ LIBDIRNAME = \ .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ @@ -41,7 +41,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -53,13 +56,22 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(SHARED)" == "1" @@ -128,6 +140,6 @@ clean: -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc index 01ec5eb50b..59545a897e 100644 --- a/samples/svg/makefile.gcc +++ b/samples/svg/makefile.gcc @@ -12,20 +12,16 @@ include ../../../build/config.gcc ### Variables: ### -LIBDIRNAME = .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = \ .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \ -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) -SVGTEST_OBJECTS = $(OBJS)\svgtest_svgtest.o SVGTEST_OBJECTS = \ $(OBJS)\svgtest_svgtest.o @@ -41,6 +37,11 @@ ifeq ($(USE_GUI),1) PORTNAME = msw endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -53,12 +54,27 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(SHARED),1) @@ -114,6 +130,6 @@ clean: -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) - $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 + $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 .PHONY: all clean diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index a9d45cd64c..66cdc161d1 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -16,8 +16,8 @@ LIBDIRNAME = \ .\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_3) /DWIN32 \ - $(__DEBUGFLAG_0) $(____DEBUGFLAG_2_p) /Fd$(OBJS)\svgtest.pdb \ +SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ @@ -34,7 +34,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -46,25 +49,55 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_0 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_0 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_3 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_3 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(SHARED)" == "1" @@ -108,11 +141,26 @@ __WXLIB_MONO_p = \ !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_2_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_2_p = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) !endif @@ -133,6 +181,6 @@ clean: -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< $(SVGTEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat index e51d59f035..f08267b71d 100644 --- a/samples/svg/makefile.wat +++ b/samples/svg/makefile.wat @@ -36,6 +36,11 @@ PORTNAME = msw !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -50,22 +55,47 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG_0 = +__DEBUGINFO_0 = !ifeq BUILD debug -__DEBUGFLAG_0 = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG_0 = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 !endif -__DEBUGFLAG_1 = +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __DLLFLAG_p = @@ -127,7 +157,7 @@ LIBDIRNAME = & .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm & +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) & -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png & @@ -161,7 +191,7 @@ $(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) @%append $(OBJS)\svgtest.lbc option quiet @%append $(OBJS)\svgtest.lbc name $^@ @%append $(OBJS)\svgtest.lbc option incremental - @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\svgtest.lbc library %i @%append $(OBJS)\svgtest.lbc diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 94f5d0d30b..a9de2c1753 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -32,10 +32,17 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + xrcdemo_xrcdemo.o \ + xrcdemo_myframe.o \ + xrcdemo_derivdlg.o \ + xrcdemo_custclas.o \ + $(__xrcdemo___win32rc) ### Conditionally set variables: ### @@ -44,7 +51,8 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @@ -80,34 +88,41 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ -@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ -@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ -@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ -@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) \ -@COND_TOOLKIT_MAC@ $(__INC_EXPAT_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ -@COND_TOOLKIT_MAC@ $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r \ -@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ + $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ + $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_0___WXLIB_HTML_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_MONOLITHIC_0@__WXLIB_XML_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @@ -122,7 +137,7 @@ all: xrcdemo$(EXEEXT) data clean: rm -rf ./.deps - rm -f -f ./*.o + rm -f ./*.o rm -f xrcdemo$(EXEEXT) data: @@ -143,8 +158,8 @@ install-strip: install uninstall: -xrcdemo$(EXEEXT): xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) - $(CXX) -o $@ xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) + $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc index d4f89fb9f4..b610f4d996 100644 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@ -20,15 +20,21 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +LIBDIRNAME = \ + .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ - -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ - -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ - $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) + -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ + -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \ + -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + $(OBJS)\xrcdemo_xrcdemo.obj \ + $(OBJS)\xrcdemo_myframe.obj \ + $(OBJS)\xrcdemo_derivdlg.obj \ + $(OBJS)\xrcdemo_custclas.obj ### Conditionally set variables: ### @@ -38,7 +44,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -50,16 +59,28 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "1" @@ -68,6 +89,15 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od !endif @@ -107,6 +137,9 @@ __WXLIB_HTML_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib +!endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif @@ -136,7 +169,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -147,7 +180,7 @@ data: if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res - ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res +$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res | diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc index cb39fc148d..3d1b00f5de 100644 --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@ -12,8 +12,22 @@ include ../../../build/config.gcc ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ + $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + $(OBJS)\xrcdemo_xrcdemo.o \ + $(OBJS)\xrcdemo_myframe.o \ + $(OBJS)\xrcdemo_derivdlg.o \ + $(OBJS)\xrcdemo_custclas.o \ + $(OBJS)\xrcdemo_xrcdemo_rc.o ### Conditionally set variables: ### @@ -27,6 +41,11 @@ ifeq ($(USE_GUI),1) PORTNAME = msw endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -39,15 +58,35 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p_1 = --define __WXDEBUG__ endif ifeq ($(SHARED),1) @@ -56,6 +95,15 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 endif @@ -72,13 +120,19 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif ifeq ($(MONOLITHIC),0) -__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +__WXLIB_HTML_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -109,7 +163,7 @@ $(OBJS)\xrcdemo_xrcdemo.o: .\xrcdemo.cpp $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< $(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o @@ -119,7 +173,7 @@ data: if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%%f copy ./rc\%%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o - $(CXX) -o $@ $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o + $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 .PHONY: all clean diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index a2f9e507a6..cf150e547c 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -12,8 +12,23 @@ ### Variables: ### -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ + /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ + /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + $(OBJS)\xrcdemo_xrcdemo.obj \ + $(OBJS)\xrcdemo_myframe.obj \ + $(OBJS)\xrcdemo_derivdlg.obj \ + $(OBJS)\xrcdemo_custclas.obj \ + $(OBJS)\xrcdemo_xrcdemo.res ### Conditionally set variables: ### @@ -23,7 +38,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -35,35 +53,77 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_0 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_0 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_2 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_2 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif -!if "$(BUILD)" == "debug" -__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif !if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /dWXUSINGDLL +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_4 = /Od @@ -81,37 +141,73 @@ __RUNTIME_LIBS_7 = T __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1 !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_3_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_3_p = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /DNDEBUG !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_3_p_1 = /d_DEBUG +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p = /DNDEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_3_p_1 = /dNDEBUG +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p_1 = /d NDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p_1 = /d NDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p_1 = /d _DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p_1 = /d NDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p_1 = /d _DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1) !endif @@ -136,7 +232,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc - rc /fo$@ /dWIN32 $(____DEBUGFLAG_3_p_1) /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i.\..\..\..\src\expat\lib /i. $(__DLLFLAG_p_1) /d_WINDOWS /i.\..\..\include $** + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\include $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -147,7 +243,7 @@ data: if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + $(XRCDEMO_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index 5c5e99b6ad..df430313f0 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -36,6 +36,11 @@ PORTNAME = msw !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -50,28 +55,65 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG_0 = +__DEBUGINFO_0 = !ifeq BUILD debug -__DEBUGFLAG_0 = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG_0 = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG_2 = !ifeq BUILD debug __OPTIMIZEFLAG_2 = -od @@ -96,15 +138,22 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif __WXLIB_HTML_p = !ifeq MONOLITHIC 0 -__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -113,8 +162,21 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) +LIBDIRNAME = & + .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & + $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) & + -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png & + -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib & + -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) +XRCDEMO_OBJECTS = & + $(OBJS)\xrcdemo_xrcdemo.obj & + $(OBJS)\xrcdemo_myframe.obj & + $(OBJS)\xrcdemo_derivdlg.obj & + $(OBJS)\xrcdemo_custclas.obj @@ -139,7 +201,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< $(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $< + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $< clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -152,13 +214,13 @@ data : if not exist $(OBJS)/rc mkdir $(OBJS)/rc for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc -$(OBJS)\xrcdemo.exe : $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res +$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res @%create $(OBJS)\xrcdemo.lbc @%append $(OBJS)\xrcdemo.lbc option quiet @%append $(OBJS)\xrcdemo.lbc name $^@ @%append $(OBJS)\xrcdemo.lbc option incremental - @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' - @for %i in ( $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj) do @%append $(OBJS)\xrcdemo.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\xrcdemo.lbc library %i + @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\xrcdemo.lbc library %i @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res wlink @$(OBJS)\xrcdemo.lbc diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index d146e629a5..5e51959bb0 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.in @@ -41,17 +41,118 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \ -DWXMAKINGDLL_STC $(CXXFLAGS) $(PIC_FLAG) +STCDLL_OBJECTS = \ + stcdll_PlatWX.o \ + stcdll_ScintillaWX.o \ + stcdll_stc.o \ + stcdll_AutoComplete.o \ + stcdll_CallTip.o \ + stcdll_CellBuffer.o \ + stcdll_ContractionState.o \ + stcdll_Document.o \ + stcdll_DocumentAccessor.o \ + stcdll_Editor.o \ + stcdll_ExternalLexer.o \ + stcdll_Indicator.o \ + stcdll_KeyMap.o \ + stcdll_KeyWords.o \ + stcdll_LexAVE.o \ + stcdll_LexAda.o \ + stcdll_LexAsm.o \ + stcdll_LexBaan.o \ + stcdll_LexBullant.o \ + stcdll_LexCPP.o \ + stcdll_LexCSS.o \ + stcdll_LexConf.o \ + stcdll_LexCrontab.o \ + stcdll_LexEiffel.o \ + stcdll_LexEScript.o \ + stcdll_LexFortran.o \ + stcdll_LexHTML.o \ + stcdll_LexLisp.o \ + stcdll_LexLout.o \ + stcdll_LexLua.o \ + stcdll_LexMatlab.o \ + stcdll_LexOthers.o \ + stcdll_LexPOV.o \ + stcdll_LexPascal.o \ + stcdll_LexPerl.o \ + stcdll_LexPython.o \ + stcdll_LexRuby.o \ + stcdll_LexSQL.o \ + stcdll_LexVB.o \ + stcdll_LineMarker.o \ + stcdll_PropSet.o \ + stcdll_RESearch.o \ + stcdll_ScintillaBase.o \ + stcdll_Style.o \ + stcdll_StyleContext.o \ + stcdll_UniConversion.o \ + stcdll_ViewStyle.o \ + stcdll_WindowAccessor.o \ + stcdll_XPM.o STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) +STCLIB_OBJECTS = \ + stclib_PlatWX.o \ + stclib_ScintillaWX.o \ + stclib_stc.o \ + stclib_AutoComplete.o \ + stclib_CallTip.o \ + stclib_CellBuffer.o \ + stclib_ContractionState.o \ + stclib_Document.o \ + stclib_DocumentAccessor.o \ + stclib_Editor.o \ + stclib_ExternalLexer.o \ + stclib_Indicator.o \ + stclib_KeyMap.o \ + stclib_KeyWords.o \ + stclib_LexAVE.o \ + stclib_LexAda.o \ + stclib_LexAsm.o \ + stclib_LexBaan.o \ + stclib_LexBullant.o \ + stclib_LexCPP.o \ + stclib_LexCSS.o \ + stclib_LexConf.o \ + stclib_LexCrontab.o \ + stclib_LexEiffel.o \ + stclib_LexEScript.o \ + stclib_LexFortran.o \ + stclib_LexHTML.o \ + stclib_LexLisp.o \ + stclib_LexLout.o \ + stclib_LexLua.o \ + stclib_LexMatlab.o \ + stclib_LexOthers.o \ + stclib_LexPOV.o \ + stclib_LexPascal.o \ + stclib_LexPerl.o \ + stclib_LexPython.o \ + stclib_LexRuby.o \ + stclib_LexSQL.o \ + stclib_LexVB.o \ + stclib_LineMarker.o \ + stclib_PropSet.o \ + stclib_RESearch.o \ + stclib_ScintillaBase.o \ + stclib_Style.o \ + stclib_StyleContext.o \ + stclib_UniConversion.o \ + stclib_ViewStyle.o \ + stclib_WindowAccessor.o \ + stclib_XPM.o ### Conditionally set variables: ### @@ -65,7 +166,8 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -81,60 +183,69 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_stcdll___depname = install_stcdll @COND_SHARED_0@__install_stclib___depname = install_stclib -@COND_SHARED_1@__stcdll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__stcdll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = \ -@COND_PLATFORM_MACOSX_1@ -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) +COND_SHARED_1___stcdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) +@COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname) +COND_PLATFORM_WIN32_1___stcdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib) +COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__stcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = \ -@COND_USE_SOSYMLINKS_1@ (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) +COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___stcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags) +COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf2 \ @@ -145,8 +256,9 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__stclib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a +COND_SHARED_0___stclib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__stclib___depname = $(COND_SHARED_0___stclib___depname) ### Targets: ### @@ -154,11 +266,11 @@ all: $(__stcdll___depname) $(__stclib___depname) clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -178,16 +290,16 @@ install-strip: install @COND_SHARED_1@install_stcdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_stclib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_ExternalLexer.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexEScript.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLout.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_ExternalLexer.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexEScript.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLout.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o $(LDFLAGS) -L$(top_builddir)lib $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__stcdll___so_symlinks_cmd) stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx @@ -337,9 +449,9 @@ stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx stcdll_stc.o: $(srcdir)/stc.cpp $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: stclib_PlatWX.o stclib_ScintillaWX.o stclib_stc.o stclib_AutoComplete.o stclib_CallTip.o stclib_CellBuffer.o stclib_ContractionState.o stclib_Document.o stclib_DocumentAccessor.o stclib_Editor.o stclib_ExternalLexer.o stclib_Indicator.o stclib_KeyMap.o stclib_KeyWords.o stclib_LexAVE.o stclib_LexAda.o stclib_LexAsm.o stclib_LexBaan.o stclib_LexBullant.o stclib_LexCPP.o stclib_LexCSS.o stclib_LexConf.o stclib_LexCrontab.o stclib_LexEiffel.o stclib_LexEScript.o stclib_LexFortran.o stclib_LexHTML.o stclib_LexLisp.o stclib_LexLout.o stclib_LexLua.o stclib_LexMatlab.o stclib_LexOthers.o stclib_LexPOV.o stclib_LexPascal.o stclib_LexPerl.o stclib_LexPython.o stclib_LexRuby.o stclib_LexSQL.o stclib_LexVB.o stclib_LineMarker.o stclib_PropSet.o stclib_RESearch.o stclib_ScintillaBase.o stclib_Style.o stclib_StyleContext.o stclib_UniConversion.o stclib_ViewStyle.o stclib_WindowAccessor.o stclib_XPM.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: $(STCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ stclib_PlatWX.o stclib_ScintillaWX.o stclib_stc.o stclib_AutoComplete.o stclib_CallTip.o stclib_CellBuffer.o stclib_ContractionState.o stclib_Document.o stclib_DocumentAccessor.o stclib_Editor.o stclib_ExternalLexer.o stclib_Indicator.o stclib_KeyMap.o stclib_KeyWords.o stclib_LexAVE.o stclib_LexAda.o stclib_LexAsm.o stclib_LexBaan.o stclib_LexBullant.o stclib_LexCPP.o stclib_LexCSS.o stclib_LexConf.o stclib_LexCrontab.o stclib_LexEiffel.o stclib_LexEScript.o stclib_LexFortran.o stclib_LexHTML.o stclib_LexLisp.o stclib_LexLout.o stclib_LexLua.o stclib_LexMatlab.o stclib_LexOthers.o stclib_LexPOV.o stclib_LexPascal.o stclib_LexPerl.o stclib_LexPython.o stclib_LexRuby.o stclib_LexSQL.o stclib_LexVB.o stclib_LineMarker.o stclib_PropSet.o stclib_RESearch.o stclib_ScintillaBase.o stclib_Style.o stclib_StyleContext.o stclib_UniConversion.o stclib_ViewStyle.o stclib_WindowAccessor.o stclib_XPM.o +@COND_SHARED_0@ $(AR) rcu $@ $(STCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ stclib_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index c6915484e9..31332a0c94 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -41,16 +41,93 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib XRCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) \ $(PIC_FLAG) +XRCDLL_OBJECTS = \ + xrcdll_xmlres.o \ + xrcdll_xh_bmp.o \ + xrcdll_xh_bmpbt.o \ + xrcdll_xh_bttn.o \ + xrcdll_xh_cald.o \ + xrcdll_xh_chckb.o \ + xrcdll_xh_chckl.o \ + xrcdll_xh_choic.o \ + xrcdll_xh_combo.o \ + xrcdll_xh_dlg.o \ + xrcdll_xh_frame.o \ + xrcdll_xh_gauge.o \ + xrcdll_xh_gdctl.o \ + xrcdll_xh_html.o \ + xrcdll_xh_listb.o \ + xrcdll_xh_listc.o \ + xrcdll_xh_menu.o \ + xrcdll_xh_notbk.o \ + xrcdll_xh_panel.o \ + xrcdll_xh_radbt.o \ + xrcdll_xh_radbx.o \ + xrcdll_xh_scrol.o \ + xrcdll_xh_scwin.o \ + xrcdll_xh_sizer.o \ + xrcdll_xh_slidr.o \ + xrcdll_xh_spin.o \ + xrcdll_xh_split.o \ + xrcdll_xh_stbmp.o \ + xrcdll_xh_stbox.o \ + xrcdll_xh_stlin.o \ + xrcdll_xh_sttxt.o \ + xrcdll_xh_text.o \ + xrcdll_xh_toolb.o \ + xrcdll_xh_tree.o \ + xrcdll_xh_unkwn.o \ + xrcdll_xh_wizrd.o \ + xrcdll_xmlrsall.o XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse \ -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCLIB_OBJECTS = \ + xrclib_xmlres.o \ + xrclib_xh_bmp.o \ + xrclib_xh_bmpbt.o \ + xrclib_xh_bttn.o \ + xrclib_xh_cald.o \ + xrclib_xh_chckb.o \ + xrclib_xh_chckl.o \ + xrclib_xh_choic.o \ + xrclib_xh_combo.o \ + xrclib_xh_dlg.o \ + xrclib_xh_frame.o \ + xrclib_xh_gauge.o \ + xrclib_xh_gdctl.o \ + xrclib_xh_html.o \ + xrclib_xh_listb.o \ + xrclib_xh_listc.o \ + xrclib_xh_menu.o \ + xrclib_xh_notbk.o \ + xrclib_xh_panel.o \ + xrclib_xh_radbt.o \ + xrclib_xh_radbx.o \ + xrclib_xh_scrol.o \ + xrclib_xh_scwin.o \ + xrclib_xh_sizer.o \ + xrclib_xh_slidr.o \ + xrclib_xh_spin.o \ + xrclib_xh_split.o \ + xrclib_xh_stbmp.o \ + xrclib_xh_stbox.o \ + xrclib_xh_stlin.o \ + xrclib_xh_sttxt.o \ + xrclib_xh_text.o \ + xrclib_xh_toolb.o \ + xrclib_xh_tree.o \ + xrclib_xh_unkwn.o \ + xrclib_xh_wizrd.o \ + xrclib_xmlrsall.o ### Conditionally set variables: ### @@ -64,7 +141,8 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @@ -80,64 +158,74 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ -@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_0___WXLIB_HTML_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_SHARED_1@__xrcdll___depname = \ -@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = \ -@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = \ -@COND_PLATFORM_MACOSX_1@ -install_name \ -@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +COND_SHARED_1___xrcdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_SHARED_1@__xrcdll___depname = $(COND_SHARED_1___xrcdll___depname) +COND_PLATFORM_WIN32_1___xrcdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib) +COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__xrcdll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = \ -@COND_USE_SOSYMLINKS_1@ (cd $(top_builddir)lib/; rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd \ -@COND_USE_SOSYMLINKS_1@ = rm -f \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) \ -@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ -@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = \ -@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = \ -@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags) +COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 \ @@ -148,8 +236,9 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__xrclib___depname = \ -@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a +COND_SHARED_0___xrclib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__xrclib___depname = $(COND_SHARED_0___xrclib___depname) ### Targets: ### @@ -157,11 +246,11 @@ all: $(__xrcdll___depname) $(__xrclib___depname) clean: rm -rf ./.deps - rm -f -f ./*.o - rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -181,18 +270,18 @@ install-strip: install @COND_SHARED_1@install_xrcdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_xrclib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) uninstall: -@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o $(LDFLAGS) -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp @@ -306,9 +395,9 @@ xrcdll_xmlres.o: $(srcdir)/xmlres.cpp xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ -@COND_SHARED_0@ $(AR) rcu $@ xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o +@COND_SHARED_0@ $(AR) rcu $@ $(XRCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 77d05008ab..fc0eb56866 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -28,10 +28,13 @@ top_srcdir = @top_srcdir@ ### Variables: ### +LIBDIRNAME = $(top_builddir)lib WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = \ + wxrc_wxrc.o ### Conditionally set variables: ### @@ -40,7 +43,8 @@ WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @@ -53,22 +57,26 @@ WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ -@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ -@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ -@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ -@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -81,7 +89,7 @@ all: wxrc$(EXEEXT) clean: rm -rf ./.deps - rm -f -f ./*.o + rm -f ./*.o rm -f wxrc$(EXEEXT) distclean: clean @@ -94,8 +102,8 @@ install-strip: install uninstall: -wxrc$(EXEEXT): wxrc_wxrc.o - $(CXX) -o $@ wxrc_wxrc.o $(LDFLAGS) -L$(top_builddir)lib $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +wxrc$(EXEEXT): $(WXRC_OBJECTS) + $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wxrc___mac_setfilecmd) diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc index cb0ddf6e84..4c4bb99cda 100644 --- a/utils/wxrc/makefile.bcc +++ b/utils/wxrc/makefile.bcc @@ -20,15 +20,18 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### +LIBDIRNAME = \ + .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ +WXRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ - -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ - -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ - $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXFLAGS) + -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ + -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \ + -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = \ + $(OBJS)\wxrc_wxrc.obj ### Conditionally set variables: ### @@ -38,7 +41,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -50,18 +56,36 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = -DWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od !endif @@ -114,7 +138,7 @@ clean: -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe: $(OBJS)\wxrc_wxrc.obj - ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ap @&&| - c0x32.obj $(OBJS)\wxrc_wxrc.obj,$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc index 19b62f9679..3b2c7e5f0f 100644 --- a/utils/wxrc/makefile.gcc +++ b/utils/wxrc/makefile.gcc @@ -12,8 +12,18 @@ include ../../../build/config.gcc ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \ + $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = \ + $(OBJS)\wxrc_wxrc.o ### Conditionally set variables: ### @@ -27,6 +37,11 @@ ifeq ($(USE_GUI),1) PORTNAME = msw endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) WXDEBUGFLAG = d endif ifeq ($(SHARED),1) @@ -39,17 +54,41 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) -__DEBUGFLAG = -g +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif endif ifeq ($(BUILD),release) -__DEBUGFLAG = +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g endif ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 endif @@ -63,7 +102,8 @@ ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) __WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml @@ -88,7 +128,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe: $(OBJS)\wxrc_wxrc.o - $(CXX) -o $@ $(OBJS)\wxrc_wxrc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) + $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 .PHONY: all clean diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc index 960cddccab..af75132f49 100644 --- a/utils/wxrc/makefile.vc +++ b/utils/wxrc/makefile.vc @@ -12,8 +12,19 @@ ### Variables: ### -OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(CXXFLAGS) +LIBDIRNAME = \ + .\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ + /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ + /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \ + $(__DLLFLAG_p) /D_CONSOLE $(CXXFLAGS) +WXRC_OBJECTS = \ + $(OBJS)\wxrc_wxrc.obj ### Conditionally set variables: ### @@ -23,7 +34,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -35,30 +49,69 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_0 = /Zi +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_0 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_1 = /DEBUG +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_1 = +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG_2 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG_2 = +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(BUILD)" == "debug" +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_3 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_4 = /Od !endif @@ -78,7 +131,8 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib @@ -86,11 +140,26 @@ __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" -____DEBUGFLAG_3_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /D_DEBUG !endif -!if "$(BUILD)" == "release" -____DEBUGFLAG_3_p = /DNDEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO_2_p = /DNDEBUG +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = /DNDEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) !endif @@ -110,7 +179,7 @@ clean: -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe: $(OBJS)\wxrc_wxrc.obj - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:CONSOLE @<< - $(OBJS)\wxrc_wxrc.obj $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index ad096e43f2..d82c7eeb41 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -36,6 +36,11 @@ PORTNAME = msw !endif WXDEBUGFLAG = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 WXDEBUGFLAG = d !endif WXDLLFLAG = @@ -50,28 +55,65 @@ WXUNIVNAME = !ifeq WXUNIV 1 WXUNIVNAME = univ !endif -__DEBUGFLAG_0 = +__DEBUGINFO_0 = !ifeq BUILD debug -__DEBUGFLAG_0 = -d2 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif !endif !ifeq BUILD release -__DEBUGFLAG_0 = -d0 +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif !endif -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = !ifeq BUILD debug -__DEBUGFLAG_1 = debug all +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif !endif !ifeq BUILD release -__DEBUGFLAG_1 = +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif __OPTIMIZEFLAG_2 = !ifeq BUILD debug __OPTIMIZEFLAG_2 = -od @@ -96,7 +138,8 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif __WXLIB_XML_p = !ifeq MONOLITHIC 0 @@ -109,8 +152,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CXXFLAGS) +LIBDIRNAME = & + .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & + $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) & + -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png & + -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib & + -i=. $(__DLLFLAG_p) $(CXXFLAGS) +WXRC_OBJECTS = & + $(OBJS)\wxrc_wxrc.obj @@ -132,13 +185,13 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe -$(OBJS)\wxrc.exe : $(OBJS)\wxrc_wxrc.obj +$(OBJS)\wxrc.exe : $(WXRC_OBJECTS) @%create $(OBJS)\wxrc.lbc @%append $(OBJS)\wxrc.lbc option quiet @%append $(OBJS)\wxrc.lbc name $^@ @%append $(OBJS)\wxrc.lbc option incremental - @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt ref 'main_' - @for %i in ( $(OBJS)\wxrc_wxrc.obj) do @%append $(OBJS)\wxrc.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\wxrc.lbc library %i + @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\wxrc.lbc library %i @%append $(OBJS)\wxrc.lbc wlink @$(OBJS)\wxrc.lbc -- 2.45.2