updated makefile for server

studouglas · Apr 14, 2016 · a57384c · a57384c
1 parent e716e13
commit a57384c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/geant4.10.02/source/externals/cuda/tests/makefile b/geant4.10.02/source/externals/cuda/tests/makefile
@@ -1,15 +1,21 @@
-LIBRARY_PATH_GEANT='../../../../../geant4.10.02-install/lib/'
+GEANT4_INSTALL_DIR='../../../../../geant4.10.02-install'
 
 HEADER_PATH_CUDA='../include'
 HEADER_PATH_CPU='../../../processes/hadronic/models/particle_hp/include'
-HEADER_PATH_GEANT='../../../../../geant4.10.02-install/include/Geant4'
+HEADER_PATH_GEANT=${GEANT4_INSTALL_DIR}/include/Geant4
+
+# Linux
+LIBRARY_PATH_GEANT=${GEANT4_INSTALL_DIR}/lib64	
+
+# OS X
+LIBRARY_PATH_GEANT=${GEANT4_INSTALL_DIR}/lib
 
 LINK_GEANT_LIBS_CPU=-lG4processes -lG4clhep -lG4global -lG4cuda
 
 all: GenerateTestResults AnalyzeTestResults
 
 GenerateTestResults:
-	g++ -std=c++11 -I $(HEADER_PATH_CPU) -I $(HEADER_PATH_GEANT) -L $(LIBRARY_PATH_GEANT) $(LINK_GEANT_LIBS_CPU) GenerateTestResults.cc -o GenerateTestResults
+	g++ -std=c++11 -I ${HEADER_PATH_CPU} -I ${HEADER_PATH_GEANT} -L ${LIBRARY_PATH_GEANT} ${LINK_GEANT_LIBS_CPU} GenerateTestResults.cc -o GenerateTestResults
 
 AnalyzeTestResults:
 	g++ -std=c++11 AnalyzeTestResults.cc -o AnalyzeTestResults