From 0ca4ab85b71e0063ff7d323b77c940219446f7fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 28 Jul 2003 08:33:29 +0000 Subject: [PATCH] ported wxSVG contrib to bakefile (patch #778614) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/Makefile | 54 ++++++++ contrib/build/svg/makefile.bcc | 179 ++++++++++++++++++++++++ contrib/build/svg/makefile.gcc | 164 ++++++++++++++++++++++ contrib/build/svg/makefile.vc | 187 +++++++++++++++++++++++++ contrib/build/svg/makefile.wat | 217 +++++++++++++++++++++++++++++ contrib/build/svg/svg.bkl | 30 ++++ contrib/include/wx/svg/dcsvg.h | 10 +- contrib/samples/svg/Makefile.in | 142 +++++++++++++++++-- contrib/samples/svg/makefile.bcc | 133 ++++++++++++++++++ contrib/samples/svg/makefile.gcc | 119 ++++++++++++++++ contrib/samples/svg/makefile.vc | 144 +++++++++++++++++-- contrib/samples/svg/makefile.wat | 171 +++++++++++++++++++++-- contrib/samples/svg/svgtest.bkl | 15 ++ contrib/src/svg/Makefile.in | 230 ++++++++++++++++++++++++++++--- include/wx/dcsvg.h | 10 +- samples/svg/Makefile.in | 142 +++++++++++++++++-- samples/svg/makefile.bcc | 133 ++++++++++++++++++ samples/svg/makefile.gcc | 119 ++++++++++++++++ samples/svg/makefile.vc | 144 +++++++++++++++++-- samples/svg/makefile.wat | 171 +++++++++++++++++++++-- samples/svg/svgtest.bkl | 15 ++ 21 files changed, 2455 insertions(+), 74 deletions(-) create mode 100644 contrib/build/svg/makefile.bcc create mode 100644 contrib/build/svg/makefile.gcc create mode 100644 contrib/build/svg/makefile.vc create mode 100644 contrib/build/svg/makefile.wat create mode 100644 contrib/build/svg/svg.bkl create mode 100644 contrib/samples/svg/makefile.bcc create mode 100644 contrib/samples/svg/makefile.gcc create mode 100644 contrib/samples/svg/svgtest.bkl create mode 100644 samples/svg/makefile.bcc create mode 100644 samples/svg/makefile.gcc create mode 100644 samples/svg/svgtest.bkl diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile index a7d01a8e48..00bf8bd52d 100644 --- a/build/bakefiles/Makefile +++ b/build/bakefiles/Makefile @@ -11,12 +11,14 @@ AUTOCONF_ALL = \ ../../Makefile.in \ ../../configure \ ../../contrib/samples/animate/Makefile.in \ + ../../contrib/samples/svg/Makefile.in \ ../../contrib/samples/xrc/Makefile.in \ ../../contrib/src/animate/Makefile.in \ ../../contrib/src/fl/Makefile.in \ ../../contrib/src/gizmos/Makefile.in \ ../../contrib/src/ogl/Makefile.in \ ../../contrib/src/stc/Makefile.in \ + ../../contrib/src/svg/Makefile.in \ ../../contrib/src/xrc/Makefile.in \ ../../contrib/utils/wxrc/Makefile.in \ ../../samples/Makefile.in \ @@ -108,8 +110,10 @@ BORLAND_ALL = \ ../../contrib/build/gizmos/makefile.bcc \ ../../contrib/build/ogl/makefile.bcc \ ../../contrib/build/stc/makefile.bcc \ + ../../contrib/build/svg/makefile.bcc \ ../../contrib/build/xrc/makefile.bcc \ ../../contrib/samples/animate/makefile.bcc \ + ../../contrib/samples/svg/makefile.bcc \ ../../contrib/samples/xrc/makefile.bcc \ ../../contrib/utils/wxrc/makefile.bcc \ ../../samples/access/makefile.bcc \ @@ -202,8 +206,10 @@ MINGW_ALL = \ ../../contrib/build/gizmos/makefile.gcc \ ../../contrib/build/ogl/makefile.gcc \ ../../contrib/build/stc/makefile.gcc \ + ../../contrib/build/svg/makefile.gcc \ ../../contrib/build/xrc/makefile.gcc \ ../../contrib/samples/animate/makefile.gcc \ + ../../contrib/samples/svg/makefile.gcc \ ../../contrib/samples/xrc/makefile.gcc \ ../../contrib/utils/wxrc/makefile.gcc \ ../../samples/access/makefile.gcc \ @@ -296,8 +302,10 @@ MSVC_ALL = \ ../../contrib/build/gizmos/makefile.vc \ ../../contrib/build/ogl/makefile.vc \ ../../contrib/build/stc/makefile.vc \ + ../../contrib/build/svg/makefile.vc \ ../../contrib/build/xrc/makefile.vc \ ../../contrib/samples/animate/makefile.vc \ + ../../contrib/samples/svg/makefile.vc \ ../../contrib/samples/xrc/makefile.vc \ ../../contrib/utils/wxrc/makefile.vc \ ../../samples/access/makefile.vc \ @@ -390,8 +398,10 @@ WATCOM_ALL = \ ../../contrib/build/gizmos/makefile.wat \ ../../contrib/build/ogl/makefile.wat \ ../../contrib/build/stc/makefile.wat \ + ../../contrib/build/svg/makefile.wat \ ../../contrib/build/xrc/makefile.wat \ ../../contrib/samples/animate/makefile.wat \ + ../../contrib/samples/svg/makefile.wat \ ../../contrib/samples/xrc/makefile.wat \ ../../contrib/utils/wxrc/makefile.wat \ ../../samples/access/makefile.wat \ @@ -491,12 +501,14 @@ clean: rm -f ../../Makefile.in rm -f ../../configure rm -f ../../contrib/samples/animate/Makefile.in + rm -f ../../contrib/samples/svg/Makefile.in rm -f ../../contrib/samples/xrc/Makefile.in rm -f ../../contrib/src/animate/Makefile.in rm -f ../../contrib/src/fl/Makefile.in rm -f ../../contrib/src/gizmos/Makefile.in rm -f ../../contrib/src/ogl/Makefile.in rm -f ../../contrib/src/stc/Makefile.in + rm -f ../../contrib/src/svg/Makefile.in rm -f ../../contrib/src/xrc/Makefile.in rm -f ../../contrib/utils/wxrc/Makefile.in rm -f ../../samples/Makefile.in @@ -587,8 +599,10 @@ clean: rm -f ../../contrib/build/gizmos/makefile.bcc rm -f ../../contrib/build/ogl/makefile.bcc rm -f ../../contrib/build/stc/makefile.bcc + rm -f ../../contrib/build/svg/makefile.bcc rm -f ../../contrib/build/xrc/makefile.bcc rm -f ../../contrib/samples/animate/makefile.bcc + rm -f ../../contrib/samples/svg/makefile.bcc rm -f ../../contrib/samples/xrc/makefile.bcc rm -f ../../contrib/utils/wxrc/makefile.bcc rm -f ../../samples/access/makefile.bcc @@ -680,8 +694,10 @@ clean: rm -f ../../contrib/build/gizmos/makefile.gcc rm -f ../../contrib/build/ogl/makefile.gcc rm -f ../../contrib/build/stc/makefile.gcc + rm -f ../../contrib/build/svg/makefile.gcc rm -f ../../contrib/build/xrc/makefile.gcc rm -f ../../contrib/samples/animate/makefile.gcc + rm -f ../../contrib/samples/svg/makefile.gcc rm -f ../../contrib/samples/xrc/makefile.gcc rm -f ../../contrib/utils/wxrc/makefile.gcc rm -f ../../samples/access/makefile.gcc @@ -773,8 +789,10 @@ clean: rm -f ../../contrib/build/gizmos/makefile.vc rm -f ../../contrib/build/ogl/makefile.vc rm -f ../../contrib/build/stc/makefile.vc + rm -f ../../contrib/build/svg/makefile.vc rm -f ../../contrib/build/xrc/makefile.vc rm -f ../../contrib/samples/animate/makefile.vc + rm -f ../../contrib/samples/svg/makefile.vc rm -f ../../contrib/samples/xrc/makefile.vc rm -f ../../contrib/utils/wxrc/makefile.vc rm -f ../../samples/access/makefile.vc @@ -866,8 +884,10 @@ clean: rm -f ../../contrib/build/gizmos/makefile.wat rm -f ../../contrib/build/ogl/makefile.wat rm -f ../../contrib/build/stc/makefile.wat + rm -f ../../contrib/build/svg/makefile.wat rm -f ../../contrib/build/xrc/makefile.wat rm -f ../../contrib/samples/animate/makefile.wat + rm -f ../../contrib/samples/svg/makefile.wat rm -f ../../contrib/samples/xrc/makefile.wat rm -f ../../contrib/utils/wxrc/makefile.wat rm -f ../../samples/access/makefile.wat @@ -1057,6 +1077,23 @@ Makefile: regenMakefile.py touch $@ +../../contrib/src/svg/Makefile.in: $(CDEPS) ../../contrib/build/svg/svg.bkl + $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/svg/svg.bkl + touch $@ +../../contrib/build/svg/makefile.bcc: $(CDEPS) ../../contrib/build/svg/svg.bkl + $(BAKEFILE) -fborland -o$@ -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl + touch $@ +../../contrib/build/svg/makefile.vc: $(CDEPS) ../../contrib/build/svg/svg.bkl + $(BAKEFILE) -fmsvc -o$@ -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl + touch $@ +../../contrib/build/svg/makefile.gcc: $(CDEPS) ../../contrib/build/svg/svg.bkl + $(BAKEFILE) -fmingw -o$@ -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl + touch $@ +../../contrib/build/svg/makefile.wat: $(CDEPS) ../../contrib/build/svg/svg.bkl + $(BAKEFILE) -fwatcom -o$@ -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/svg -DWXTOPDIR=../../../ ../../contrib/build/svg/svg.bkl + touch $@ + + ../../contrib/src/xrc/Makefile.in: $(CDEPS) ../../contrib/build/xrc/xrc.bkl $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl touch $@ @@ -1091,6 +1128,23 @@ Makefile: regenMakefile.py touch $@ +../../contrib/samples/svg/Makefile.in: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl + $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/svg/svgtest.bkl + touch $@ +../../contrib/samples/svg/makefile.bcc: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl + $(BAKEFILE) -fborland -o$@ -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl + touch $@ +../../contrib/samples/svg/makefile.vc: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl + $(BAKEFILE) -fmsvc -o$@ -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl + touch $@ +../../contrib/samples/svg/makefile.gcc: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl + $(BAKEFILE) -fmingw -o$@ -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl + touch $@ +../../contrib/samples/svg/makefile.wat: $(SDEPS) ../../contrib/samples/svg/svgtest.bkl + $(BAKEFILE) -fwatcom -o$@ -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DWXTOPDIR=../../../ ../../contrib/samples/svg/svgtest.bkl + touch $@ + + ../../contrib/samples/xrc/Makefile.in: $(SDEPS) ../../contrib/samples/xrc/xrcdemo.bkl $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/samples/xrc/xrcdemo.bkl touch $@ diff --git a/contrib/build/svg/makefile.bcc b/contrib/build/svg/makefile.bcc new file mode 100644 index 0000000000..533d35fb31 --- /dev/null +++ b/contrib/build/svg/makefile.bcc @@ -0,0 +1,179 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +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) \ + $(__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 \ + -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) -Hu \ + -H=$(OBJS)\wxprec_svgdll.csm +SVGDLL_OBJECTS = \ + $(OBJS)\svgdll_dummy.obj \ + $(OBJS)\svgdll_dcsvg.obj +SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__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 \ + -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) -Hu -H=$(OBJS)\wxprec_svglib.csm +SVGLIB_OBJECTS = \ + $(OBJS)\svglib_dummy.obj \ + $(OBJS)\svglib_dcsvg.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__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 +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_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 +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__svgdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__svglib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__svgdll___depname) $(__svglib___depname) + +$(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp + $(CXX) -q -c -P -o$@ $(SVGDLL_CXXFLAGS) $** + +$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(SVGDLL_CXXFLAGS) -H $** + +$(OBJS)\svglib_dcsvg.obj: ../../src/svg\dcsvg.cpp + $(CXX) -q -c -P -o$@ $(SVGLIB_CXXFLAGS) $** + +$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(SVGLIB_CXXFLAGS) -H $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib + +!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) @&&| + 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 $@ +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib: $(SVGLIB_OBJECTS) $(OBJS)\svglib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(SVGLIB_OBJECTS) +| +!endif diff --git a/contrib/build/svg/makefile.gcc b/contrib/build/svg/makefile.gcc new file mode 100644 index 0000000000..1aa6136b44 --- /dev/null +++ b/contrib/build/svg/makefile.gcc @@ -0,0 +1,164 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### 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) \ + -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) \ + -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 + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__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 +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__svgdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__svglib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__svgdll___depname) $(__svglib___depname) + +$(OBJS)\svgdll_dcsvg.o: ../../src/svg\dcsvg.cpp + $(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $< + +$(OBJS)\svgdll_dummy.o: ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $< + +$(OBJS)\svglib_dcsvg.o: ../../src/svg\dcsvg.cpp + $(CXX) -c -o $@ $(SVGLIB_CXXFLAGS) $< + +$(OBJS)\svglib_dummy.o: ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(SVGLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a + +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) +endif + +ifeq ($(SHARED),0) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a: $(SVGLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(SVGLIB_OBJECTS) + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/svg/makefile.vc b/contrib/build/svg/makefile.vc new file mode 100644 index 0000000000..faaa2247ca --- /dev/null +++ b/contrib/build/svg/makefile.vc @@ -0,0 +1,187 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +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) \ + /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" +SVGDLL_OBJECTS = \ + $(OBJS)\svgdll_dummy.obj \ + $(OBJS)\svgdll_dcsvg.obj +SVGLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ + $(__DEBUGFLAG_2) $(____DEBUGFLAG) \ + /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" +SVGLIB_OBJECTS = \ + $(OBJS)\svglib_dummy.obj \ + $(OBJS)\svglib_dcsvg.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__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 +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = T +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_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 +!endif +!if "$(MONOLITHIC)" == "1" +__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 +!endif +!if "$(BUILD)" == "release" +____DEBUGFLAG = /DNDEBUG +!endif +!if "$(SHARED)" == "1" +__svgdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__svglib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__svgdll___depname) $(__svglib___depname) + +$(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) $** + +$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\svglib_dcsvg.obj: ../../src/svg\dcsvg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SVGLIB_CXXFLAGS) $** + +$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SVGLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib + +!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) @<< + $(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 + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib: $(SVGLIB_OBJECTS) $(OBJS)\svglib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(SVGLIB_OBJECTS) +<< +!endif diff --git a/contrib/build/svg/makefile.wat b/contrib/build/svg/makefile.wat new file mode 100644 index 0000000000..40158f334d --- /dev/null +++ b/contrib/build/svg/makefile.wat @@ -0,0 +1,217 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG = +!ifeq BUILD debug +__DEBUGFLAG = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__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 +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__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 +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__svgdll___depname = +!ifeq SHARED 1 +__svgdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_wat$(VENDORTAG).dll +!endif +__svglib___depname = +!ifeq SHARED 0 +__svglib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib +!endif + +### Variables: ### + +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 & + $(__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 & + -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) /fh=$(OBJS)\wxprec_svgdll.pch +SVGDLL_OBJECTS = & + $(OBJS)\svgdll_dummy.obj & + $(OBJS)\svgdll_dcsvg.obj +SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__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 & + -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) /fh=$(OBJS)\wxprec_svglib.pch +SVGLIB_OBJECTS = & + $(OBJS)\svglib_dummy.obj & + $(OBJS)\svglib_dcsvg.obj + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__svgdll___depname) $(__svglib___depname) + +$(OBJS)\svgdll_dcsvg.obj : .AUTODEPEND ../../src/svg\dcsvg.cpp + $(CXX) -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $< + +$(OBJS)\svgdll_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $< + +$(OBJS)\svglib_dcsvg.obj : .AUTODEPEND ../../src/svg\dcsvg.cpp + $(CXX) -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $< + +$(OBJS)\svglib_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib + +!ifeq SHARED 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_wat$(VENDORTAG).dll : $(SVGDLL_OBJECTS) + @%create $(OBJS)\svgdll.lbc + @%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) + @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 + @%append $(OBJS)\svgdll.lbc system nt_dll + wlink @$(OBJS)\svgdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib +$^@ +!endif + +!ifeq SHARED 0 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib : $(SVGLIB_OBJECTS) + @%create $(OBJS)\svglib.lbc + @for %i in ($(SVGLIB_OBJECTS)) do @%append $(OBJS)\svglib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\svglib.lbc +!endif diff --git a/contrib/build/svg/svg.bkl b/contrib/build/svg/svg.bkl new file mode 100644 index 0000000000..374109b231 --- /dev/null +++ b/contrib/build/svg/svg.bkl @@ -0,0 +1,30 @@ + + + + + + + + + dcsvg.cpp + + + + + wx/svg/dcsvg.h + + + + + WXUSINGDLL + WXMAKINGDLL_SVG + $(SVG_SRC) + core + base + + + + $(SVG_SRC) + + + diff --git a/contrib/include/wx/svg/dcsvg.h b/contrib/include/wx/svg/dcsvg.h index 289f1eaccb..c2eef701b8 100644 --- a/contrib/include/wx/svg/dcsvg.h +++ b/contrib/include/wx/svg/dcsvg.h @@ -3,6 +3,14 @@ #include #include +#ifdef WXMAKINGDLL_SVG + #define WXDLLIMPEXP_SVG WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_SVG WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_SVG +#endif + #define wxSVGVersion wxT("v0100") #ifdef __BORLANDC__ #pragma warn -rch @@ -20,7 +28,7 @@ #define mm2pt 2.83464566929 #define pt2mm 0.352777777778 -class wxSVGFileDC : public wxDC +class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC { private: diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index 5f1ba42210..1b4a09f736 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -1,16 +1,138 @@ -# Makefile for svg sample. -# $Id$ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -program_dir = contrib/samples/svg -PROGRAM=svgtest +@MAKE_SET@ -OBJECTS=svgtest.o +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +EXEEXT = @EXEEXT@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_GUI = @LDFLAGS_GUI@ +RESCOMP = @RESCOMP@ +SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ -APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_dcsvg-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ -APPEXTRADEFS=-I$(top_srcdir)/contrib/include +### Variables: ### -include $(top_builddir)/src/makeprog.env +LIBDIRNAME = $(top_builddir)lib +SVGTEST_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) +SVGTEST_OBJECTS = \ + svgtest_svgtest.o +### Conditionally set variables: ### + +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@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_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@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_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_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_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 __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 svgtest$(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 = \ + -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@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C svgtest$(EXEEXT) + +### Targets: ### + +all: svgtest$(EXEEXT) + +clean: + rm -rf ./.deps + rm -f ./*.o + rm -f svgtest$(EXEEXT) + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all + +install-strip: install + +svgtest$(EXEEXT): $(SVGTEST_OBJECTS) + $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-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) + $(__svgtest___mac_rezcmd) + $(__svgtest___mac_setfilecmd) + +svgtest_svgtest.o: $(srcdir)/svgtest.cpp + $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install uninstall diff --git a/contrib/samples/svg/makefile.bcc b/contrib/samples/svg/makefile.bcc new file mode 100644 index 0000000000..cb8d831df1 --- /dev/null +++ b/contrib/samples/svg/makefile.bcc @@ -0,0 +1,133 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +LIBDIRNAME = \ + .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -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.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__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 +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_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 +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp + $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + +$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -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 new file mode 100644 index 0000000000..01ec5eb50b --- /dev/null +++ b/contrib/samples/svg/makefile.gcc @@ -0,0 +1,119 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### 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) \ + -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 + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__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 +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.o: .\svgtest.cpp + $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -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 + +.PHONY: all clean diff --git a/contrib/samples/svg/makefile.vc b/contrib/samples/svg/makefile.vc index a04ddcea89..a9d45cd64c 100644 --- a/contrib/samples/svg/makefile.vc +++ b/contrib/samples/svg/makefile.vc @@ -1,14 +1,138 @@ -# File: makefile.vc for svgtest sample -# Author: Julian Smart -# Created: 2001-06-12 -# Updated: +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(WXWIN) -PROGRAM = svgtest +!include <../../../build/config.vc> -OBJECTS = $(PROGRAM).obj -EXTRALIBS = $(WXDIR)\lib\dcsvg$(LIBEXT).lib -EXTRAINC = -I$(WXDIR)\contrib\include +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.vc +### Variables: ### +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 \ + $(__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) +SVGTEST_OBJECTS = \ + $(OBJS)\svgtest_svgtest.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__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 +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_4 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = T +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_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 +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" +____DEBUGFLAG_2_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" +____DEBUGFLAG_2_p = /DNDEBUG +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + +$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_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 047d7741de..e51d59f035 100644 --- a/contrib/samples/svg/makefile.wat +++ b/contrib/samples/svg/makefile.wat @@ -1,13 +1,168 @@ -# Purpose: makefile for SVG example (Watcom) -# Created 2000-07-28 +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(%WXWIN) +!include ../../../build/config.wat -EXTRACPPFLAGS = -I$(WXDIR)\contrib\include -PROGRAM = svgtest -EXTRALIBS = $(WXDIR)\lib\dcsvg_w.lib -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.wat +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__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 +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__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 +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +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 & + $(__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) +SVGTEST_OBJECTS = & + $(OBJS)\svgtest_svgtest.obj + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.obj : .AUTODEPEND .\svgtest.cpp + $(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + +$(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) + @%create $(OBJS)\svgtest.lbc + @%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' + @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 + wlink @$(OBJS)\svgtest.lbc diff --git a/contrib/samples/svg/svgtest.bkl b/contrib/samples/svg/svgtest.bkl new file mode 100644 index 0000000000..6796c6e488 --- /dev/null +++ b/contrib/samples/svg/svgtest.bkl @@ -0,0 +1,15 @@ + + + + + + + + + svgtest.cpp + + svg + core + base + + diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 904597247e..6ed1666270 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -1,25 +1,223 @@ -# $Id$ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -libsrc_dir = contrib/src/svg -TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_dcsvg-@WX_RELEASE@ +@MAKE_SET@ -LIBVERSION_CURRENT=@WX_CURRENT@ -LIBVERSION_REVISION=@WX_REVISION@ -LIBVERSION_AGE=@WX_AGE@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +AR = @AR@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +DLLPREFIX = @DLLPREFIX@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = @INSTALL_DIR@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LN_S = @LN_S@ +PIC_FLAG = @PIC_FLAG@ +RANLIB = @RANLIB@ +SHARED_LD_CXX = @SHARED_LD_CXX@ +SONAME_FLAG = @SONAME_FLAG@ +SO_SUFFIX = @SO_SUFFIX@ +STRIP = @STRIP@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +VENDOR = @VENDOR@ +includedir = @includedir@ +libdir = @libdir@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ -HEADER_PATH=$(top_srcdir)/contrib/include/wx -HEADER_SUBDIR=svg +### Variables: ### -HEADERS=dcsvg.h +LIBDIRNAME = $(top_builddir)lib +SVGDLL_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_SVG $(CXXFLAGS) \ + $(PIC_FLAG) +SVGDLL_OBJECTS = \ + svgdll_dcsvg.o +SVGLIB_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) +SVGLIB_OBJECTS = \ + svglib_dcsvg.o -OBJECTS=dcsvg.o -DEPFILES=$(OBJECTS:.o=.d) +### Conditionally set variables: ### -APPEXTRADEFS=-I$(top_srcdir)/contrib/include +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) +@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_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@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_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_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_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 = \ + -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_svgdll___depname = install_svgdll +@COND_SHARED_0@__install_svglib___depname = install_svglib +COND_SHARED_1___svgdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) +@COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname) +COND_PLATFORM_WIN32_1___svgdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__svgdll___importlib = $(COND_PLATFORM_WIN32_1___svgdll___importlib) +COND_PLATFORM_MACOSX_1___svgdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__svgdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___svgdll___macinstnamecmd) +@COND_PLATFORM_MACOSX_1@__svgdll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__svgdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__svgdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___svgdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__svgdll___soname_flags = $(COND_USE_SOVERLINUX_1___svgdll___soname_flags) +COND_USE_SOVERSOLARIS_1___svgdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__svgdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___svgdll___soname_flags) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__svgdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__svgdll___targetsuf2 = .$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__svgdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__svgdll___targetsuf3 = .$(SO_SUFFIX) +COND_SHARED_0___svglib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__svglib___depname = $(COND_SHARED_0___svglib___depname) -include $(top_builddir)/src/makelib.env +### Targets: ### --include $(DEPFILES) +all: $(__svgdll___depname) $(__svglib___depname) + +clean: + rm -rf ./.deps + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all $(__install_svgdll___depname) $(__install_svglib___depname) + $(INSTALL_DIR) $(includedir) + for f in wx/svg/dcsvg.h; do \ + if test ! -d $(includedir)/`dirname $$f` ; then \ + $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ + fi; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \ + done + +install-strip: install + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) + +@COND_SHARED_1@install_svgdll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__svgdll___so_symlinks_inst_cmd)) + +@COND_SHARED_0@install_svglib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a $(libdir) + +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(__svgdll___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@ $(__svgdll___so_symlinks_cmd) + +svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp + $(CXXC) -c -o $@ $(SVGDLL_CXXFLAGS) $< + +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a: $(SVGLIB_OBJECTS) +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ $(SVGLIB_OBJECTS) +@COND_SHARED_0@ $(RANLIB) $@ + +svglib_dcsvg.o: $(srcdir)/dcsvg.cpp + $(CXXC) -c -o $@ $(SVGLIB_CXXFLAGS) $< + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install install_svgdll install_svglib uninstall diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h index 289f1eaccb..c2eef701b8 100644 --- a/include/wx/dcsvg.h +++ b/include/wx/dcsvg.h @@ -3,6 +3,14 @@ #include #include +#ifdef WXMAKINGDLL_SVG + #define WXDLLIMPEXP_SVG WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_SVG WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_SVG +#endif + #define wxSVGVersion wxT("v0100") #ifdef __BORLANDC__ #pragma warn -rch @@ -20,7 +28,7 @@ #define mm2pt 2.83464566929 #define pt2mm 0.352777777778 -class wxSVGFileDC : public wxDC +class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC { private: diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 5f1ba42210..1b4a09f736 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -1,16 +1,138 @@ -# Makefile for svg sample. -# $Id$ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -program_dir = contrib/samples/svg -PROGRAM=svgtest +@MAKE_SET@ -OBJECTS=svgtest.o +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +EXEEXT = @EXEEXT@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_GUI = @LDFLAGS_GUI@ +RESCOMP = @RESCOMP@ +SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ -APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_dcsvg-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ -APPEXTRADEFS=-I$(top_srcdir)/contrib/include +### Variables: ### -include $(top_builddir)/src/makeprog.env +LIBDIRNAME = $(top_builddir)lib +SVGTEST_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) +SVGTEST_OBJECTS = \ + svgtest_svgtest.o +### Conditionally set variables: ### + +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@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_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@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_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_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_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 __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 svgtest$(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 = \ + -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@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C svgtest$(EXEEXT) + +### Targets: ### + +all: svgtest$(EXEEXT) + +clean: + rm -rf ./.deps + rm -f ./*.o + rm -f svgtest$(EXEEXT) + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all + +install-strip: install + +svgtest$(EXEEXT): $(SVGTEST_OBJECTS) + $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-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) + $(__svgtest___mac_rezcmd) + $(__svgtest___mac_setfilecmd) + +svgtest_svgtest.o: $(srcdir)/svgtest.cpp + $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install uninstall diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc new file mode 100644 index 0000000000..cb8d831df1 --- /dev/null +++ b/samples/svg/makefile.bcc @@ -0,0 +1,133 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +LIBDIRNAME = \ + .\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -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.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__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 +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_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 +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp + $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + +$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -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 new file mode 100644 index 0000000000..01ec5eb50b --- /dev/null +++ b/samples/svg/makefile.gcc @@ -0,0 +1,119 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### 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) \ + -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 + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__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 +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.o: .\svgtest.cpp + $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -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 + +.PHONY: all clean diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index a04ddcea89..a9d45cd64c 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -1,14 +1,138 @@ -# File: makefile.vc for svgtest sample -# Author: Julian Smart -# Created: 2001-06-12 -# Updated: +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(WXWIN) -PROGRAM = svgtest +!include <../../../build/config.vc> -OBJECTS = $(PROGRAM).obj -EXTRALIBS = $(WXDIR)\lib\dcsvg$(LIBEXT).lib -EXTRAINC = -I$(WXDIR)\contrib\include +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.vc +### Variables: ### +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 \ + $(__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) +SVGTEST_OBJECTS = \ + $(OBJS)\svgtest_svgtest.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__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 +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_4 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = T +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_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 +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" +____DEBUGFLAG_2_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" +____DEBUGFLAG_2_p = /DNDEBUG +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + +$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_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 047d7741de..e51d59f035 100644 --- a/samples/svg/makefile.wat +++ b/samples/svg/makefile.wat @@ -1,13 +1,168 @@ -# Purpose: makefile for SVG example (Watcom) -# Created 2000-07-28 +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(%WXWIN) +!include ../../../build/config.wat -EXTRACPPFLAGS = -I$(WXDIR)\contrib\include -PROGRAM = svgtest -EXTRALIBS = $(WXDIR)\lib\dcsvg_w.lib -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.wat +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__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 +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__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 +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +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 & + $(__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) +SVGTEST_OBJECTS = & + $(OBJS)\svgtest_svgtest.obj + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\svgtest.exe + +$(OBJS)\svgtest_svgtest.obj : .AUTODEPEND .\svgtest.cpp + $(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + +$(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) + @%create $(OBJS)\svgtest.lbc + @%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' + @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 + wlink @$(OBJS)\svgtest.lbc diff --git a/samples/svg/svgtest.bkl b/samples/svg/svgtest.bkl new file mode 100644 index 0000000000..6796c6e488 --- /dev/null +++ b/samples/svg/svgtest.bkl @@ -0,0 +1,15 @@ + + + + + + + + + svgtest.cpp + + svg + core + base + + -- 2.45.2