Commit 94a39110 authored by jfuser's avatar jfuser
Browse files

update for windows binary compilation

parent 7f9b22ab
Pipeline #78 failed with stage
in 8 minutes and 46 seconds
......@@ -19,6 +19,8 @@ Description: A spatio-temporal stochastic model to assess resistance deployment
License: GPL (>= 2) | file LICENSE
LazyData: true
BuildVignettes: false
NeedsCompilation: yes
Biarch: true
SystemRequirements: C++11, gsl, gdal >= 2.0.0
Depends:
methods,
......
......@@ -2551,7 +2551,7 @@ CXXFLAGS="${CXXFLAGS}"
ac_config_files="$ac_config_files src/Makevars src/Makevars.win"
ac_config_files="$ac_config_files src/Makevars"
cat >confcache <<\_ACEOF
......@@ -3260,7 +3260,6 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"src/Makevars") CONFIG_FILES="$CONFIG_FILES src/Makevars" ;;
"src/Makevars.win") CONFIG_FILES="$CONFIG_FILES src/Makevars.win" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
......
......@@ -120,8 +120,6 @@ AC_SUBST(CXXFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_CONFIG_FILES([src/Makevars\
src/Makevars.win
])
AC_CONFIG_FILES([src/Makevars])
AC_OUTPUT
PKG_CPPFLAGS = -DNDEBUG -DGDAL_VERSION=2 \
-I../windows/gdal2-2.2.0/include/ \
-I../windows/gdal2-2.2.0/include/gdal \
-I../windows/gdal2-2.2.0/include/geos \
-I../windows/gdal2-2.2.0/include/proj
PKG_LIBS = \
-L../windows/gdal2-2.2.0/lib-4.9.3${R_ARCH} \
-lgsl
-lgdal -lsqlite3 -lspatialite -lproj -lgeos_c -lgeos \
-ljson-c -lnetcdf -lpq -lintl -lwebp -lcurl -lssh2 -lssl -lcrypto \
-lhdf5_hl -lhdf5 -lexpat -lfreexl -lcfitsio \
-lpng16 -ljpeg -ltiff -lgeotiff -lgif -lxml2 -llzma -lszip -lz \
-lodbc32 -lodbccp32 -liconv -lpsapi -lws2_32 -lcrypt32 -lwldap32 -lsecur32 -lgdi32 \
-lgsl
CXX_STD=CXX11
PKG_CPPFLAGS = @CPPFLAGS@
PKG_CXXFLAGS = @CXXFLAGS@
PKG_LIBS = @LDFLAGS@
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment