florent/triskele
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modifié : MakefileNoOTB

Browse Source 
modifié :         include/IImage.hpp
	modifié :         include/triskeleGdalGetType.hpp
This commit is contained in:
Git Merciol 2018-03-16 13:14:33 +01:00
parent f1198076d8
commit 9ac0b5b752
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MakefileNoOTB
View File

@ -21,9 +21,9 @@ PRF_SRC = $(patsubst %, $(CPP_DIR)/%.cpp, $(PRF_PRG))
PRF_OUT = $(patsubst %, $(OUT_DIR)/%, $(PRF_PRG))
## FLAGS ###############################
DFLAGS = -O2 -DNDEBUG -DBOOST_DISABLE_ASSERTS -DNO_OTB -DINTEL_TBB_THREAD
DFLAGS = -O2 -DNDEBUG -DBOOST_DISABLE_ASSERTS -DNO_OTB # -DINTEL_TBB_THREAD
#DFLAGS = -g -DENABLE_LOG -DNO_OTB -DTHREAD_DISABLE -DENABLE_SMART_LOG
IFLAGS = $(DFLAGS) -MMD -I$(HPP_DIR)
IFLAGS = $(DFLAGS) -MMD -I$(HPP_DIR) -I/usr/include/gdal
LFLAGS = -L$(LIB_DIR) -ltriskele -lstdc++ -lpthread -lboost_system -lboost_chrono -lboost_thread -lboost_program_options -lboost_date_time -lboost_serialization -lboost_filesystem -lboost_unit_test_framework -lgdal -ltbb
CC = g++

2
include/IImage.hpp
View File

@ -5,7 +5,7 @@
#include <iostream>
#include <boost/assert.hpp>
#include <gdal/gdal_priv.h>
#include <gdal_priv.h>
#include "triskeleBase.hpp"
#include "triskeleDebug.hpp"

2
include/triskeleGdalGetType.hpp
View File

@ -2,7 +2,7 @@
#define _OTB_TRISKELE_GDAL_GET_TYPE_HPP
#ifdef NO_OTB
#include <gdal/gdal_priv.h>
#include <gdal_priv.h>
#else
#include <otbGdalDataTypeBridge.h>
#endif