Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interf…

…aces. Thanks, master for ticket and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4da019ea19a2d36190fb0ffc887a11652296dad4 1 parent ad55bb0
Justin Bronn authored March 16, 2011
4  django/contrib/gis/gdal/libgdal.py
@@ -13,8 +13,8 @@
13 13
 if lib_path:
14 14
     lib_names = None
15 15
 elif os.name == 'nt':
16  
-    # Windows NT shared library
17  
-    lib_names = ['gdal17', 'gdal16', 'gdal15']
  16
+    # Windows NT shared libraries
  17
+    lib_names = ['gdal18', 'gdal17', 'gdal16', 'gdal15']
18 18
 elif os.name == 'posix':
19 19
     # *NIX library names.
20 20
     lib_names = ['gdal', 'GDAL', 'gdal1.7.0', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
2  django/contrib/gis/geos/libgeos.py
@@ -23,7 +23,7 @@
23 23
     lib_names = None
24 24
 elif os.name == 'nt':
25 25
     # Windows NT libraries
26  
-    lib_names = ['libgeos_c-1']
  26
+    lib_names = ['geos_c', 'libgeos_c-1']
27 27
 elif os.name == 'posix':
28 28
     # *NIX libraries
29 29
     lib_names = ['geos_c', 'GEOS']

0 notes on commit 4da019e

Please sign in to comment.
Something went wrong with that request. Please try again.