Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
@jbronn jbronn authored
View
4 django/contrib/gis/gdal/libgdal.py
@@ -13,8 +13,8 @@
if lib_path:
lib_names = None
elif os.name == 'nt':
- # Windows NT shared library
- lib_names = ['gdal17', 'gdal16', 'gdal15']
+ # Windows NT shared libraries
+ lib_names = ['gdal18', 'gdal17', 'gdal16', 'gdal15']
elif os.name == 'posix':
# *NIX library names.
lib_names = ['gdal', 'GDAL', 'gdal1.7.0', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
View
2  django/contrib/gis/geos/libgeos.py
@@ -23,7 +23,7 @@
lib_names = None
elif os.name == 'nt':
# Windows NT libraries
- lib_names = ['libgeos_c-1']
+ lib_names = ['geos_c', 'libgeos_c-1']
elif os.name == 'posix':
# *NIX libraries
lib_names = ['geos_c', 'GEOS']
Please sign in to comment.
Something went wrong with that request. Please try again.