Commit 288f8617 authored by Frédéric Krüger's avatar Frédéric Krüger

Modification du makefile des TPL

parent 03fc2b90
...@@ -450,32 +450,23 @@ public: ...@@ -450,32 +450,23 @@ public:
UNAME := $(shell uname) UNAME := $(shell uname)
#ifeq ($(UNAME),Darwin)
EASEALIB_PATH=$(EZ_PATH)libeasea/ EASEALIB_PATH=$(EZ_PATH)libeasea/
#else
#EASEALIB_PATH=\EZ_PATHlibeasea/
#endif
ifeq ($(UNAME),Darwin)
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
else
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include #USER MAKEFILE OPTIONS :
endif \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
OBJS = EASEA.o EASEAIndividual.o OBJS = EASEA.o EASEAIndividual.o
ifeq ($(UNAME),Darwin) LIBS = -lpthread
LIBS = $(EZ_PATH)boost/program_options.a
else
LIBS = -lboost_program_options -lpthread
endif
\INSERT_MAKEFILE_OPTION \INSERT_MAKEFILE_OPTION
TARGET = EASEA TARGET = EASEA
$(TARGET): $(OBJS) $(TARGET): $(OBJS)
$(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(EZ_PATH)boost/program_options.a
#%.o:%.cpp #%.o:%.cpp
......
...@@ -657,14 +657,14 @@ public: ...@@ -657,14 +657,14 @@ public:
\START_CUDA_MAKEFILE_TPL \START_CUDA_MAKEFILE_TPL
NVCC= nvcc NVCC= nvcc
CPPC= g++ CPPC= g++
LIBAESAE=\EZ_PATHlibeasea/ LIBAESAE=$(EZ_PATH)libeasea/
CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include -I$(EZ_PATH)boost
LDFLAGS=-lboost_program_options $(LIBAESAE)libeasea.a -lpthread LDFLAGS=$(EZ_PATH)boost/program_options.a $(LIBAESAE)libeasea.a -lpthread
#USER MAKEFILE OPTIONS : #USER MAKEFILE OPTIONS :
\INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
CPPFLAGS+= -I$(LIBAESAE)include -I/usr/local/cuda/include/ CPPFLAGS+= -I$(LIBAESAE)include -I$(EZ_PATH)boost
NVCCFLAGS+= NVCCFLAGS+=
......
...@@ -749,14 +749,14 @@ public: ...@@ -749,14 +749,14 @@ public:
\START_CUDA_MAKEFILE_TPL \START_CUDA_MAKEFILE_TPL
NVCC= nvcc NVCC= nvcc
CPPC= g++ CPPC= g++
LIBAESAE=\EZ_PATHlibeasea/ LIBAESAE=$(EZ_PATH)libeasea/
CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include CXXFLAGS+=-g -Wall -O2 -I$(LIBAESAE)include -I$(EZ_PATH)boost
LDFLAGS=-lboost_program_options $(LIBAESAE)libeasea.a -lpthread LDFLAGS=$(EZ_PATH)boost/program_options.a $(LIBAESAE)libeasea.a -lpthread
#USER MAKEFILE OPTIONS : #USER MAKEFILE OPTIONS :
\INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
CPPFLAGS+= -I$(LIBAESAE)include CPPFLAGS+= -I$(LIBAESAE)include -I$(EZ_PATH)boost
NVCCFLAGS+= NVCCFLAGS+=
......
...@@ -484,30 +484,21 @@ public: ...@@ -484,30 +484,21 @@ public:
UNAME := $(shell uname) UNAME := $(shell uname)
#ifeq ($(UNAME),Darwin)
EASEALIB_PATH=$(EZ_PATH)libeasea/ EASEALIB_PATH=$(EZ_PATH)libeasea/
#else
#EASEALIB_PATH=\EZ_PATHlibeasea/
#endif
ifeq ($(UNAME),Darwin)
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
else
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include #USER MAKEFILE OPTIONS :
endif \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
OBJS = EASEA.o EASEAIndividual.o OBJS = EASEA.o EASEAIndividual.o
ifeq ($(UNAME),Darwin) LIBS = -lpthread
LIBS = $(EZ_PATH)boost/program_options.a
else
LIBS = -lboost_program_options -lpthread
endif
TARGET = EASEA TARGET = EASEA
$(TARGET): $(OBJS) $(TARGET): $(OBJS)
$(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(EZ_PATH)boost/program_options.a
#%.o:%.cpp #%.o:%.cpp
......
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