Changeset 855

Show
Ignore:
Timestamp:
08/19/08 00:19:50 (4 months ago)
Author:
hobu
Message:

no more version info in nmake.opt

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/nmake.opt

    r811 r855  
    88 
    99# libLAS package settings 
    10 PACKAGE_VERSION=1.0.0b1 
     10 
    1111LAS_LIB = liblas.lib 
    12 LAS_DLL = liblas$(PACKAGE_VERSION).dll 
     12LAS_DLL = liblas.dll 
    1313LAS_LIB_DLL = liblas_i.lib 
    1414 
    … …  
    1818# Uncomment the folling line to build GeoTIFF support for reading and 
    1919# writing LAS files with Coordinate Systems information. 
    20 GEOTIFF_HOME=C:\cvs\buildkit\geotiff\libgeotiff 
     20GEOTIFF_HOME=C:\osgeo4w 
    2121 
    2222!IFDEF GEOTIFF_HOME 
    23 GEOTIFF_LIB = $(GEOTIFF_HOME)\geotiff_i.lib 
    24 GEOTIFF_INCLUDE = -I$(GEOTIFF_HOME) 
     23GEOTIFF_LIB = $(GEOTIFF_HOME)\lib\geotiff_i.lib 
     24GEOTIFF_INCLUDE = -I$(GEOTIFF_HOME)\include 
    2525INCLUDES = $(INCLUDES) $(GEOTIFF_INCLUDE) 
    2626!ENDIF 
    … …  
    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$(PACKAGE_VERSION)_d.dll 
     37LAS_DLL = liblas_d.dll 
    3838LAS_LIB_DLL = liblas_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$(PACKAGE_VERSION).dll 
     42LAS_DLL = liblas.dll 
    4343LAS_LIB_DLL = liblas_i.lib 
    4444!ENDIF 
    4545 
    46 CFLAGS= $(OPTFLAGS) /DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"  $(INCLUDES)  
     46CFLAGS= $(OPTFLAGS) $(INCLUDES)  
    4747 
    4848!IFDEF GEOTIFF_HOME