 |
tRemoved path to 32 bit libs - sphere - GPU-based 3D discrete element method al… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit e91c3c31392a2aeaec595a637d2d5c894ed8a111 |
|
parent 36d1b69ce3c82a3eed0a0ba5d3ca99583d2da7af |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Tue, 4 Dec 2012 11:32:51 +0100 |
|
|
|
Removed path to 32 bit libs |
|
|
|
Diffstat: |
|
M src/Makefile | 7 ++----- |
|
|
|
1 file changed, 2 insertions(+), 5 deletions(-) |
|
--- |
|
diff --git a/src/Makefile b/src/Makefile |
|
t@@ -60,7 +60,8 @@ else # If Linux |
|
#GL_LIBS+=-L/usr/X11/lib -lglut -lGL -lGLU |
|
SDKPATH=$(HOME)/NVIDIA_GPU_Computing_SDK/C/common |
|
EXECUTABLE=../sphere_linux_$(ARCH) |
|
- LDFLAGS=-L$(SDKPATH)/lib/linux -L$(CUDA_INSTALL_PATH)/lib -L$(CUDA_INSTALL… |
|
+ LDFLAGS=-L$(SDKPATH)/lib/linux -L$(CUDA_INSTALL_PATH)/lib64 |
|
+ #LDFLAGS+=-L$(CUDA_INSTALL_PATH)/lib # 32 bit |
|
endif |
|
|
|
INCLUDES+=-I. -I$(SDKPATH)/shared/inc -I$(SDKPATH)/inc -I$(CUDA_INSTALL_PATH)/… |
|
t@@ -69,11 +70,8 @@ LDFLAGS+=-L$(SDKPATH)/../../shared/lib -L$(SDKPATH)/../lib |
|
LDFLAGS+=-lcutil_x86_64 -lcuda -lcudart |
|
LDFLAGS+=-fopenmp |
|
|
|
-#all: $(CCFILES) $(CUFILES) $(EXECUTABLE) raytracer |
|
all: $(CCFILES) $(CUFILES) $(EXECUTABLE) folders |
|
|
|
-#raytracer: |
|
-# $(MAKE) -C ../raytracer/ |
|
|
|
$(EXECUTABLE): $(OBJECTS) |
|
$(LINKER) $(OBJECTS) $(LDFLAGS) -o $@ |
|
t@@ -114,7 +112,6 @@ backup: |
|
clean: |
|
$(RM) $(OBJECTS) |
|
$(RM) ../sphere_* |
|
- # $(MAKE) -C ../raytracer clean |
|
|
|
clear: |
|
# Remove all output data and images |
