From: Chris Elliott <biol75@york.ac.uk>
Date: Fri, 21 Jun 2002 09:46:32 +0000 (+0000)
Subject: svg Unix fix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fa89fbe54fa61c93acc60aea9a6b2f38707b4408?ds=inline

svg Unix fix


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

diff --git a/contrib/configure b/contrib/configure
index 054e0c7389..32d878c135 100755
--- a/contrib/configure
+++ b/contrib/configure
@@ -816,6 +816,7 @@ trap 'rm -fr `echo "
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
+            src/svg/Makefile	    
             src/xrc/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
@@ -829,6 +830,7 @@ trap 'rm -fr `echo "
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
+            samples/svg/Makefile	    
             samples/canvas/Makefile
             samples/canvas/test/Makefile
             samples/canvas/simple/Makefile
@@ -933,6 +935,7 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
+            src/svg/Makefile	    
             src/xrc/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
@@ -946,6 +949,7 @@ CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
             samples/ogl/ogledit/Makefile
             samples/ogl/studio/Makefile
             samples/stc/Makefile
+            samples/svg/Makefile	    
             samples/canvas/Makefile
             samples/canvas/test/Makefile
             samples/canvas/simple/Makefile
diff --git a/contrib/configure.in b/contrib/configure.in
index c35f135d47..ef6db6c6ec 100644
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -41,6 +41,7 @@ AC_OUTPUT([
             src/ogl/Makefile
             src/mmedia/Makefile
             src/stc/Makefile
+            src/svg/Makefile	    
             src/xrc/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
diff --git a/contrib/samples/Makefile.in b/contrib/samples/Makefile.in
index be88e149d0..9dc158100a 100644
--- a/contrib/samples/Makefile.in
+++ b/contrib/samples/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$
 
-CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc xrc #applet
+CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc svg xrc #applet
 
 all:
 	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in
index a34d871ea6..8c63b68960 100644
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile for plot sample.
+# Makefile for svg sample.
 # $Id$
 
 top_srcdir = @top_srcdir@/..
diff --git a/contrib/samples/svg/svgtest.cpp b/contrib/samples/svg/svgtest.cpp
index a8f76a6f61..60cf0520f3 100644
--- a/contrib/samples/svg/svgtest.cpp
+++ b/contrib/samples/svg/svgtest.cpp
@@ -39,6 +39,9 @@ USERC("svg.rc");
 #include <wx/toolbar.h>
 #include <wx/svg/dcsvg.h>
 
+#ifndef __WXMSW__
+#include "mondrian.xpm"									     
+#endif									    
 #include "bitmaps/new.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/help.xpm"
diff --git a/contrib/src/Makefile.in b/contrib/src/Makefile.in
index 0d880d3147..b7d0b5a630 100644
--- a/contrib/src/Makefile.in
+++ b/contrib/src/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$
 
-CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc xrc #applet
+CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc #applet
 
 all:
 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in
index 9dc158100a..929bb120b5 100644
--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -1,10 +1,25 @@
 # $Id$
 
-CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc svg xrc #applet
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../..
+libsrc_dir = contrib/src/dcsvg
 
-all:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
+TARGET_LIBNAME=libwx_dcsvg
 
-clean:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done
+LIBVERSION_CURRENT=1
+LIBVERSION_REVISION=0
+LIBVERSION_AGE=0
 
+HEADER_PATH=$(top_srcdir)/contrib/include/wx
+HEADER_SUBDIR=dcsvg
+
+HEADERS=dcsvg.h
+
+OBJECTS=dcsvg.o
+DEPFILES=$(OBJECTS:.o=.d)
+
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
+include $(top_builddir)/src/makelib.env
+
+-include $(DEPFILES)
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index a34d871ea6..8c63b68960 100644
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile for plot sample.
+# Makefile for svg sample.
 # $Id$
 
 top_srcdir = @top_srcdir@/..
diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index a8f76a6f61..60cf0520f3 100644
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -39,6 +39,9 @@ USERC("svg.rc");
 #include <wx/toolbar.h>
 #include <wx/svg/dcsvg.h>
 
+#ifndef __WXMSW__
+#include "mondrian.xpm"									     
+#endif									    
 #include "bitmaps/new.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/help.xpm"