polaroid-pp

commit 43a5fe30dfc4c05043b2fe1887a14348d8253fa5
parent 3dbfaf49b6a9acf68c26fcf6f2da6286bc49ede7
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date:   Thu, 23 Jun 2016 16:09:31 +0200

generalized c/c++ compiler with cc and CC flags, respectively

Diffstat:
M
Makefile
 | 
2
--
M
Makefile.config
 | 
5
+++++
M
third_party/Makefile
 | 
6
+++---
M
third_party/Makefile.cubismz
 | 
2
+-

4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,7 +1,5 @@
 include ./Makefile.config
 
-CC = mpic++
-
 HDR = $(wildcard src/*.h)
 SRC = $(wildcard src/*.cpp)
 OBJ = ${SRC:.cpp=.o}
diff --git a/Makefile.config b/Makefile.config
@@ -1,3 +1,8 @@
+SHELL := /bin/bash
+
+CC ?= mpic++
+cc ?= mpicc
+
 config ?= release
 bs ?= 16
 align ?= 16
diff --git a/third_party/Makefile b/third_party/Makefile
@@ -11,17 +11,17 @@ OBJLib3 = ${PNGWRTR_SRC:.cc=.o}
 all: libCubismZ.a libpng.a
 
 libCubismZ.a:
-	$(MAKE) -e -f Makefile.cubismz config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1
+	$(MAKE) -e -f Makefile.cubismz CC=$(CC) config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1
 
 libpng.a: $(OBJLib2) $(OBJLib3)
 	ar rcs ../lib/libpng.a $(OBJLib2) $(OBJLib3)
 	ranlib ../lib/libpng.a
 
 .c.o:
-	mpicc -c $(CFLAGS) -o $@ $<
+	$(cc) -c $(CFLAGS) -o $@ $<
 
 .cc.o:
-	mpic++ -c $(CPPFLAGS) $(INC) -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(INC) -o $@ $<
 
 clean:
 	rm -rf $(OBJLib2) $(OBJLib3) ../lib/libpng.a
diff --git a/third_party/Makefile.cubismz b/third_party/Makefile.cubismz
@@ -22,7 +22,7 @@ all: $(OBJLib1)
 	ranlib ../lib/libCubismZ.a
 
 .cpp.o:
-	mpic++ -c $(CPPFLAGS) $(INC) -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(INC) -o $@ $<
 
 clean:
 	rm -f $(OBJLib1) ../lib/libCubismZ.a