jonathan: thuban ChangeLog,1.787,1.788 setup.py,1.48,1.49

[cvs@intevation.de]

Author: jonathan

Update of /thubanrepository/thuban
In directory doto:/tmp/cvs-serv12342

Modified Files:
	ChangeLog setup.py 
Log Message:
Forgot to remove wx_cs_params from the gdal compile options.


Index: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -d -r1.787 -r1.788
--- ChangeLog	18 Feb 2005 14:54:17 -0000	1.787
+++ ChangeLog	18 Feb 2005 14:56:42 -0000	1.788
@@ -1,5 +1,9 @@
 2005-02-18  Jonathan Coles <jonathan at intevation.de>
 
+	* setup.py: Remove wx_cs_params from gdal compile options.
+
+2005-02-18  Jonathan Coles <jonathan at intevation.de>
+
 	Refactored baserenderer.py and renderer.py to remove baserenderer.py's
 	dependencies on wxPython. Added a new method projected_raster_layer()
 	that returns a raster layer image in projected space. This must be

Index: setup.py
===================================================================
RCS file: /thubanrepository/thuban/setup.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- setup.py	16 Feb 2005 21:14:47 -0000	1.48
+++ setup.py	18 Feb 2005 14:56:42 -0000	1.49
@@ -1093,10 +1093,8 @@
             self.extensions.append(Extension("Lib.gdalwarp",
                                 [ext_dir + "/thuban/gdalwarp.cpp"],
                                 include_dirs = gdal_cs_params[CS_INCDIRS] +
-                                               [ext_dir + "/thuban/"] +
-                                               wx_cs_params[CS_INCDIRS],
-                                define_macros = gdal_cs_params[CS_DEFS] +
-                                                wx_cs_params[CS_DEFS],
+                                               [ext_dir + "/thuban/"],
+                                define_macros = gdal_cs_params[CS_DEFS],
                                 library_dirs = gdal_cs_params[CS_LIBDIRS],
                                 libraries = gdal_cs_params[CS_LIBS]))