Mercurial > hg > Game > Cerium

changeset 1928:58aa5452584c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix makefile
author Shohei KOKUBO <e105744@ie.u-ryukyu.ac.jp>
date Fri, 31 Jan 2014 11:25:35 +0900
parents 4eefec26e3e2
children 904bc213c51b
files example/multiply/Makefile example/multiply/Makefile.cuda
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/example/multiply/Makefile	Fri Jan 31 07:15:07 2014 +0900
+++ b/example/multiply/Makefile	Fri Jan 31 11:25:35 2014 +0900
@@ -30,3 +30,4 @@
 	@$(MAKE) -f Makefile.macosx clean
 	@$(MAKE) -f Makefile.linux clean
 	@$(MAKE) -f Makefile.gpu clean
+	@$(MAKE) -f Makefile.cuda clean
--- a/example/multiply/Makefile.cuda	Fri Jan 31 07:15:07 2014 +0900
+++ b/example/multiply/Makefile.cuda	Fri Jan 31 11:25:35 2014 +0900
@@ -33,8 +33,8 @@
 
 all: $(TARGET) 
 
-$(TARGET): $(OBJS) $(TASK_OBJS) $(CUDA_SRCS_TMP)
-	$(NVCC) $(NVCCFLAGS) $(CUDA_SRCS_TMP)
+$(TARGET): $(OBJS) $(TASK_OBJS) $(CUDA_SRCS_TMP) $(CUDA_TASK_DIR)
+	$(NVCC) $(NVCCFLAGS) $(CUDA_SRCS_TMP) -o $(CUDA_TASK_DIR)/$@.ptx
 	$(CC) -o $@ $(OBJS) $(TASK_OBJS) $(LIBS)
 
 link:
@@ -46,4 +46,4 @@
 clean:
 	rm -f $(TARGET) $(OBJS) $(TASK_OBJS) $(CUDA_OBJS)
 	rm -f *~ \#*
-	rm -f gpu/*~ gpu/\#*
+	rm -f cuda/*~ cuda/\#*