Changeset 874

Show
Ignore:
Timestamp:
09/20/08 16:01:03 (4 months ago)
Author:
hobu
Message:

Fix #74 and use liblas1.dll as the dll name

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/nmake.opt

    r855 r874  
    1010 
    1111LAS_LIB = liblas.lib 
    12 LAS_DLL = liblas.dll 
     12LAS_DLL = liblas1.dll 
    1313LAS_LIB_DLL = liblas_i.lib 
    1414 
    … …  
    3535OPTFLAGS= /nologo /MDd /EHsc /Zi /W4 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /DDEBUG /D_DEBUG /Fd$(LAS_ROOT)\las.pdb 
    3636LAS_LIB = liblas_d.lib 
    37 LAS_DLL = liblas_d.dll 
    38 LAS_LIB_DLL = liblas_i.lib 
     37LAS_DLL = liblas_d1.dll 
     38LAS_LIB_DLL = libl1as_i.lib 
    3939!ELSE 
    4040OPTFLAGS=/nologo /MD /EHsc /Ox /GR /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /DNDEBUG 
    4141LAS_LIB = liblas.lib 
    42 LAS_DLL = liblas.dll 
     42LAS_DLL = liblas1.dll 
    4343LAS_LIB_DLL = liblas_i.lib 
    4444!ENDIF 

  • trunk/python/liblas/core.py

    r844 r874  
    105105    # stolen from Shapely 
    106106    # http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/shapely/geos.py 
    107     lib_name = 'liblas.dll' 
     107    lib_name = 'liblas1.dll' 
    108108    try: 
    109109        local_dlls = os.path.abspath(os.__file__ + "../../../DLLs")