summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbustico2009-07-07 13:48:54 +0000
committerbustico2009-07-07 13:48:54 +0000
commitb0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f (patch)
tree0573e40c9569a6c3a549b84aa2eeecd9ad21412a /src
parent746a37f3e9cb95f99023deb040a5f65e8886a036 (diff)
downloadivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.zip
ivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.tar.gz
ivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.tar.bz2
ivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.tar.xz
fix openmp makefile to permit compilation with gcc-mp-43 or gcc-mp-44
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.osx26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Makefile.osx b/src/Makefile.osx
index 35e65de..ff2a44c 100644
--- a/src/Makefile.osx
+++ b/src/Makefile.osx
@@ -22,17 +22,17 @@ else
endif
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
+OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o param.o
+OMPOBJ = ivyloop.o timer.o ivysocket_omp.o ivy_omp.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o param.o
TOOLS_DIR = ../tools
-# you should first install gcc version >= 4.3
+# you should first install gcc version >= 4.3
# gcc (g++) 4.3 is the first gcc version which support openmp under macosx
-# using macport greatly simplify gcc install : port install gcc43
-OMPCC = gcc-mp-4.3
-OMPCPP = g++-mp-4.3
-OMPLIBTOOL =gar q
+# using macport greatly simplify gcc install : port install gcc44
+OMPCC = gcc-mp-4.4
+OMPCPP = g++-mp-4.4
+OMPLIBTOOL =ar q
OMPCFLAGS = -g -Wall $(FPIC) -fopenmp -DOPENMP=1
OMPLIB = -lgomp -lpthread
@@ -40,12 +40,12 @@ 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)
+#CC=gcc
+#CPP=g++
+CC = $(OMPCC)
+CPP = $(OMPCPP)
+LIBTOOL = $(OMPLIBTOOL)
+CFLAGS = $(OMPCFLAGS)
# ------------------------------------------------------------------------------------------