Commit f7349e47 authored by demo's avatar demo
Browse files

update for downgrade gdal

parent 13095700
Pipeline #112 passed with stage
in 21 minutes and 59 seconds
......@@ -40,8 +40,8 @@ Imports:
rgeos,
maptools,
fields,
splancs
Suggests: sf
splancs,
sf
Collate:
'invlogit.R'
'logit.R'
......
......@@ -3,12 +3,12 @@ CXX_STD = CXX11
GDAL_INC_DIR=$(GDAL_HOME)/include
GDAL_LIB_DIR=$(GDAL_HOME)/lib
PKG_CPPFLAGS=-I$(GDAL_INC_DIR)
PKG_CPPFLAGS=-I$(GDAL_INC_DIR) -I$(LIB_GSL)/include
ifeq "$(WIN)" "64"
PKG_LIBS=-L$(GDAL_LIB_DIR)/x64 -lgdal -lproj -lexpat -lsqlite3 -lodbc32 -lodbccp32 -liconv -lws2_32
PKG_LIBS=-L$(LIB_GSL)/lib/x64 -lgsl -lgslcblas -L$(GDAL_LIB_DIR)/x64 -lgdal -lproj -lexpat -lsqlite3 -lodbc32 -lodbccp32 -liconv -lws2_32
else
PKG_LIBS=-L$(GDAL_LIB_DIR)/i386 -lgdal -lproj -lexpat -lsqlite3 -lodbc32 -lodbccp32 -liconv -lws2_32
PKG_LIBS=-L$(LIB_GSL)/lib/i386 -lgsl -lgslcblas -L$(GDAL_LIB_DIR)/i386 -lgdal -lproj -lexpat -lsqlite3 -lodbc32 -lodbccp32 -liconv -lws2_32
endif
PKG_CPPFLAGS = -DNDEBUG -DGDAL_VERSION=1
......
......@@ -26,9 +26,9 @@
#include <Rcpp.h>
#include <math.h>
#include <iostream>
#include <gdal/gdal.h>
#include <gdal.h>
//#include <gdal/org_api.h>
#include <gdal/ogrsf_frmts.h>
#include <ogrsf_frmts.h>
using namespace std;
......
......@@ -30,8 +30,8 @@
#include <limits.h>
#include <gsl/gsl_rng.h>
#include <gsl/gsl_randist.h>
#include <gdal/gdal.h>
#include <gdal/ogrsf_frmts.h>
#include <gdal.h>
#include <ogrsf_frmts.h>
#ifndef GDALV2
#if GDAL_VERSION_MAJOR >= 2
......
Markdown is supported
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