From 1a55595e69e5c5a3847fef936d7d7caa3df800de Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Mon, 10 Feb 2003 21:55:23 +0000 Subject: [PATCH 1/1] fix contrib makefile for watcom git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/svg/makefile.wat | 17 +++++++++++++++++ contrib/src/svg/dcsvg.cpp | 2 +- contrib/src/svg/makefile.wat | 24 ++++++++++++++++++++++++ samples/svg/makefile.wat | 17 +++++++++++++++++ src/common/dcsvg.cpp | 2 +- 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 contrib/samples/svg/makefile.wat create mode 100644 contrib/src/svg/makefile.wat create mode 100644 samples/svg/makefile.wat diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat new file mode 100644 index 0000000000..c21f84f740 --- /dev/null +++ b/contrib/samples/svg/makefile.wat @@ -0,0 +1,17 @@ +# +# Makefile for WATCOM +# + + +WXDIR = $(%WXWIN) + +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\samples\svg +OUTPUTDIR = $(THISDIR)\ + +PROGRAM = svgtest +EXTRALIBS = $(WXDIR)\lib\svg.lib +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + diff --git a/contrib/src/svg/dcsvg.cpp b/contrib/src/svg/dcsvg.cpp index d59ecb0277..ed303084a4 100644 --- a/contrib/src/svg/dcsvg.cpp +++ b/contrib/src/svg/dcsvg.cpp @@ -757,7 +757,7 @@ void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) -void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool bTransparent /*=0*/ ) +void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) { if (m_graphics_changed) NewGraphics (); diff --git a/contrib/src/svg/makefile.wat b/contrib/src/svg/makefile.wat new file mode 100644 index 0000000000..1f647d55bb --- /dev/null +++ b/contrib/src/svg/makefile.wat @@ -0,0 +1,24 @@ +# svg makefile for Watcom C++ + +WXDIR = ..\..\.. +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include + +!include $(WXDIR)\src\makewat.env + +SVGLIB = $(WXDIR)\lib\svg.lib +THISDIR = $(WXDIR)\contrib\src\svg +OUTPUTDIR = $(THISDIR)\ + +NAME = svg +LNK = $(name).lnk + +OBJECTS = dcsvg.obj + +all: $(SVGLIB) + +$(SVGLIB): $(OBJECTS) + *wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS) + +clean: .SYMBOLIC + -erase *.obj *.bak *.err *.pch $(SVGLIB) *.lbc + diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat new file mode 100644 index 0000000000..c21f84f740 --- /dev/null +++ b/samples/svg/makefile.wat @@ -0,0 +1,17 @@ +# +# Makefile for WATCOM +# + + +WXDIR = $(%WXWIN) + +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\samples\svg +OUTPUTDIR = $(THISDIR)\ + +PROGRAM = svgtest +EXTRALIBS = $(WXDIR)\lib\svg.lib +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp index d59ecb0277..ed303084a4 100644 --- a/src/common/dcsvg.cpp +++ b/src/common/dcsvg.cpp @@ -757,7 +757,7 @@ void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) -void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool bTransparent /*=0*/ ) +void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) { if (m_graphics_changed) NewGraphics (); -- 2.45.2