[Liblas-commits] r1068 - in trunk: . src

[liblas-commits at liblas.org]

Author: hobu
Date: Mon Feb 23 23:33:23 2009
New Revision: 1068
URL: http://liblas.org/changeset/1068

Log:
w00t! windows building.

Modified:
   trunk/makefile.vc
   trunk/src/makefile.vc

Modified: trunk/makefile.vc
==============================================================================
--- trunk/makefile.vc	(original)
+++ trunk/makefile.vc	Mon Feb 23 23:33:23 2009
@@ -77,4 +77,6 @@
     cd $(LAS_HOME)/
     xcopy /y /r /d /f /s c:\osgeo4w\bin\geotiff.dll $(BINDIR)
     xcopy /y /r /d /f /s c:\osgeo4w\bin\libtiff.dll $(BINDIR)
+    xcopy /y /r /d /f /s c:\osgeo4w\bin\jpeg_osgeo.dll $(BINDIR)
+    xcopy /y /r /d /f /s c:\osgeo4w\bin\zlib_osgeo.dll $(BINDIR)
     c:\cygwin\bin\zip.exe -r packages/liblas-$(PACKAGE_VERSION)-win32.zip bin
\ No newline at end of file

Modified: trunk/src/makefile.vc
==============================================================================
--- trunk/src/makefile.vc	(original)
+++ trunk/src/makefile.vc	Mon Feb 23 23:33:23 2009
@@ -5,6 +5,7 @@
 !INCLUDE $(LAS_ROOT)\nmake.opt
 
 LAS_OBJS = \
+    lascolor.obj \
     laswriter.obj \
     lasreader.obj \
     laserror.obj \
@@ -12,13 +13,16 @@
     laspoint.obj \
     lasheader.obj \
     lasfile.obj \
+    lassrs.obj \
     lasrecordheader.obj \
     detail\reader.obj \
     detail\reader10.obj \
     detail\reader11.obj \
+    detail\reader12.obj \
     detail\writer.obj \
     detail\writer10.obj \
     detail\writer11.obj \
+    detail\writer12.obj \
     detail\file.obj
 
 RES = Version.res
@@ -29,7 +33,7 @@
 
 $(LAS_LIB):	$(LAS_OBJS)
     if exist $(LAS_LIB) del $(LAS_LIB)
-    $(LINK) /lib /nologo /out:$(LAS_LIB) $(LAS_OBJS) $(GEOTIFF_LIB)
+    $(LINK) /lib /nologo /out:$(LAS_LIB) $(LAS_OBJS) $(GEOTIFF_LIB) $(GDAL_LIB)
 	
 $(LAS_DLL):	$(LAS_LIB) $(RES)
     $(LINK) /dll \