mirror of
https://github.com/django/django.git
synced 2024-12-25 02:26:12 +00:00
Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
ad55bb0f87
commit
4da019ea19
@ -13,8 +13,8 @@ except (AttributeError, EnvironmentError, ImportError):
|
||||
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']
|
||||
|
@ -23,7 +23,7 @@ if lib_path:
|
||||
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']
|
||||
|
Loading…
Reference in New Issue
Block a user