Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDA…

…L interfaces. Thanks, master for ticket and initial patch.

Backport of r15852 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e594ca7f937c12939b60c9f7d77f4752cb808412 1 parent 1e2d896
Justin Bronn jbronn authored
4 django/contrib/gis/gdal/libgdal.py
View
@@ -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']
2  django/contrib/gis/geos/libgeos.py
View
@@ -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.