Changes between Version 62 and Version 63 of Cookbook gdal

Timestamp:

Feb 1, 2010 9:00:36 PM (15 years ago)

Author:

cedric

Comment:

--

Cookbook gdal

@@ -272 +272 @@
 4. Ensure the configure.win, Makefile.win and RGDAL.def are all correct. 
 
-## set the location of GDAL_HOME in configure.win (mine is GDAL_HOME="C:/FWTools")
-## Also change libgdal-1.dll to gdal_fw.dll in configure.win
-
-Specifically, mine looks like this:
+## set the location of GDAL_HOME in configure.win (mine is GDAL_HOME="C:\OSGeo4W\bin")
+## Also change libgdal-1.dll to gdal16.dll in configure.win
+The configure.win below includes the dll for postgres libq.dll
 
 -//-- start configure.win
@@ -281 +280 @@
 #!/bin/sh
 if test -z "$GDAL_HOME" ; then
-    GDAL_HOME="C:/FWTools"
+    GDAL_HOME="C:\OSGeo4W\bin"
 fi
 echo "GDAL_HOME=${GDAL_HOME}" > src/Makeconf.win
@@ -287 +286 @@
 echo "using GDAL_HOME: ${GDAL_HOME}"
 
-mkdir $DPKG/libs
-cp ${GDAL_HOME}/bin/gdal_fw.dll $DPKG/libs
-
+if test -z "$OSGEO4W_BUILD" ; then
+
+  if test -z "$R_PACKAGE_DIR" ; then
+    R_PACKAGE_DIR=${DPKG}
+ fi
+
+  mkdir "${R_PACKAGE_DIR}/libs"
+  cp ${GDAL_HOME}/bin/gdal16.dll "${R_PACKAGE_DIR}/libs"
+  cp ${GDAL_HOME}/bin/libexpat.dll "${R_PACKAGE_DIR}/libs"
+  cp ${GDAL_HOME}/bin/libpq.dll "${R_PACKAGE_DIR}/libs"
+  cp -r ${GDAL_HOME}/share/proj "${R_PACKAGE_DIR}"
+  cp -r ${GDAL_HOME}/share/gdal "${R_PACKAGE_DIR}"
+  echo "OSGEO= " >> src/Makeconf.win
+
+else
+    echo "OSGEO=-DOSGEO4W" >> src/Makeconf.win
+fi
 -//-- end configure.win