fix contrib makefile for watcom

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat
new file mode 100644 (file)
index 0000000..c21f84f
--- /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 d59ecb0277ac2dfd67943b1b9183ec61014e28b8..ed303084a4b06936289f60381ecdb773c07fdfaa 100644 (file)
--- 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 (file)
index 0000000..1f647d5
--- /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 (file)
index 0000000..c21f84f
--- /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 d59ecb0277ac2dfd67943b1b9183ec61014e28b8..ed303084a4b06936289f60381ecdb773c07fdfaa 100644 (file)
--- 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 ();