Commit aee03dc8 authored by Ogier Maitre's avatar Ogier Maitre

Local libboost also used under linux.

parent 0a207537
......@@ -6,11 +6,11 @@ LDFLAGS =
ifeq ($(UNAME),Darwin)
#ifeq ($(UNAME),Darwin)
$(EXEC):EaseaSym.o EaseaParse.o EaseaLex.o alexyacc/libalex.a EaseaYTools.o boost/program_options.a libeasea/libeasea.a
else
$(EXEC):EaseaSym.o EaseaParse.o EaseaLex.o alexyacc/libalex.a EaseaYTools.o libeasea/libeasea.a
endif
#else
#$(EXEC):EaseaSym.o EaseaParse.o EaseaLex.o alexyacc/libalex.a EaseaYTools.o libeasea/libeasea.a
#endif
$(CPPC) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
#
# Congratulations ! It looks like you compiled EASEA successfully.
......@@ -87,10 +87,10 @@ alexyacc/libalex.so:alexyacc/*.cpp
alexyacc/libalex.a:alexyacc/*.cpp
cd alexyacc && make libalex.a
ifeq ($(UNAME),Darwin)
#ifeq ($(UNAME),Darwin)
boost/program_options.a:boost/*.cpp
cd boost && make program_options.a
endif #OS
#endif #OS
#compile libeasea
libeasea/libeasea.a:libeasea/*.cpp
......@@ -100,9 +100,9 @@ clean:
rm -f *.o $(EXEC) $(EXEC)_bin
cd alexyacc && make clean
cd libeasea && make clean
ifeq ($(UNAME),Darwin)
#ifeq ($(UNAME),Darwin)
cd boost && make clean
endif
#endif
#install:$(EXEC)
# sudo cp $< /usr/bin/dev-easea
......
......@@ -4,7 +4,7 @@
* Created on: 22 juin 2009
* Author: maitre
*/
#include "boost/program_options.hpp"
#include <boost/program_options.hpp>
#include <iostream>
#include <stdio.h>
......
......@@ -15,21 +15,21 @@ ifeq ($(EZ_CUDA),1)
OBJS += CCuda.o
endif
ifeq ($(UNAME),Darwin)
#ifeq ($(UNAME),Darwin)
LIBS =
else ifeq ($(UNAME),Linux)
LIBS = -lboost_program_options
endif #OS
#else ifeq ($(UNAME),Linux)
#LIBS = -lboost_program_options
#endif #OS
TARGET = libeasea.a
CPPFLAGS=-I/usr/local/cuda/include/
CPPFLAGS=-I/usr/local/cuda/include/ -I../boost/
$(TARGET): $(OBJS)
ifeq ($(UNAME),Darwin)
ar rcs $@ $^ ../boost/program_options.a
else ifeq ($(UNAME),Linux)
ar rcs $@ $^
endif #OS
#ifeq ($(UNAME),Darwin)
ar rcs $@ $^ #../boost/program_options.a
#else ifeq ($(UNAME),Linux)
# ar rcs $@ $^
#endif #OS
#$(TARGET): $(OBJS)
# ar rcs $@ $^
......
......@@ -450,11 +450,11 @@ EASEALIB_PATH=$(EZ_PATH)/libeasea/
#EASEALIB_PATH=$(EZ_PATH)/libeasea/
#endif
ifeq ($(UNAME),Darwin)
#ifeq ($(UNAME),Darwin)
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
endif
#else
#CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include
#endif
#USER MAKEFILE OPTIONS :
\INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
......@@ -462,16 +462,12 @@ endif
OBJS = EASEA.o EASEAIndividual.o
ifeq ($(UNAME),Darwin)
LIBS = $(EZ_PATH)boost/program_options.a
else
LIBS = -lboost_program_options -lpthread
endif
LIBS = -lpthread
TARGET = EASEA
$(TARGET): $(OBJS)
$(CXX) -o $(TARGET) $(OBJS) $(LDFLAGS) $(LIBS) -g $(EASEALIB_PATH)/libeasea.a
$(CXX) -o $(TARGET) $(OBJS) $(LDFLAGS) $(LIBS) -g $(EASEALIB_PATH)/libeasea.a $(EZ_PATH)boost/program_options.a
#%.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