diff options
| -rw-r--r-- | src/Makefile.osx | 20 | ||||
| -rw-r--r-- | tools/Makefile.osx | 6 |
2 files changed, 19 insertions, 7 deletions
diff --git a/src/Makefile.osx b/src/Makefile.osx index c95cf90..35e65de 100644 --- a/src/Makefile.osx +++ b/src/Makefile.osx @@ -25,9 +25,6 @@ REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT) OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o OMPOBJ = ivyloop.o timer.o ivysocket_omp.o ivy_omp.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o -CC=gcc -LIBTOOL=ar q # linux and solaris -CFLAGS = -g -Wall $(FPIC) TOOLS_DIR = ../tools # you should first install gcc version >= 4.3 @@ -35,9 +32,21 @@ TOOLS_DIR = ../tools # using macport greatly simplify gcc install : port install gcc43 OMPCC = gcc-mp-4.3 OMPCPP = g++-mp-4.3 -OMPCFLAGS = $(CFLAGS) -fopenmp -DOPENMP=1 +OMPLIBTOOL =gar q +OMPCFLAGS = -g -Wall $(FPIC) -fopenmp -DOPENMP=1 OMPLIB = -lgomp -lpthread + +LIBTOOL=ar q # linux and solaris +CFLAGS = -g -Wall $(FPIC) + +CC=gcc +CPP=g++ +#CC = $(OMPCC) +#CPP = $(OMPCPP) +#LIBTOOL = $(OMPLIBTOOL) +#CFLAGS = $(OMPCFLAGS) + # ------------------------------------------------------------------------------------------ .c.o: @@ -47,8 +56,9 @@ OMPLIB = -lgomp -lpthread $(CPP) $(CFLAGS) -c $*.cpp -all: static-libs shared-libs tools +all: static-libs tools # shared-libs libomp: libivy_omp.a + omp: libomp @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.osx omp) diff --git a/tools/Makefile.osx b/tools/Makefile.osx index 580a44c..a45e4ff 100644 --- a/tools/Makefile.osx +++ b/tools/Makefile.osx @@ -1,5 +1,3 @@ -CC = gcc -g -Wall -CPP='g++' GLUTINC = -I/usr/include -I. GLUTLIB = -L. -lglut -lGLU -lGL -lX11 -lXmu @@ -11,6 +9,10 @@ OMP_TARGET= ivyprobe_omp ivythroughput_omp OMPLIB = -lgomp -lpthread OMPCC = gcc-mp-4.3 OMPCPP = g++-mp-4.3 +CC = gcc -g -Wall +CPP='g++' +#CC = $(OMPCC) +#CPP= $(OMPCPP) PCRELIB = `pcre-config --libs` PCREINCL = `pcre-config --cflags` |