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 054e0c7389aa552d4aeb85aff0a10fe8890653da..32d878c1351ba4125307ccab215004a18534a82d 100755 (executable)
--- 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 c35f135d478b61f7d75f8461d100cef91d35897d..ef6db6c6ec3136f0517c9385232640c63b851167 100644 (file)
--- 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 be88e149d0e9d897981b337b3014f171d898acbb..9dc158100adb4faa3abeaa98f3205d2e5c40afa4 100644 (file)
--- 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 a34d871ea6f2f7c0ad0317b212061e1c317e3e80..8c63b689608ec329916f9711957a0f7edb07f3c1 100644 (file)
--- 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 a8f76a6f6111e63640c84af8bedb19388e7c2956..60cf0520f3c5285e15e137c012180751139535ca 100644 (file)
--- 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 0d880d3147f770aa614a6664ed187effaaec3cf5..b7d0b5a6303c4a991221781812693d6449569284 100644 (file)
--- 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 9dc158100adb4faa3abeaa98f3205d2e5c40afa4..929bb120b58a82ed82f4335415090311ee3ff620 100644 (file)
--- 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 a34d871ea6f2f7c0ad0317b212061e1c317e3e80..8c63b689608ec329916f9711957a0f7edb07f3c1 100644 (file)
--- 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 a8f76a6f6111e63640c84af8bedb19388e7c2956..60cf0520f3c5285e15e137c012180751139535ca 100644 (file)
--- 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"