diff options
| author | Determinant <ted.sybil@gmail.com> | 2015-06-23 13:32:42 +0800 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2015-06-23 13:32:42 +0800 |
| commit | 8f13607cba9d6cf4fc4a213ba5ae4bcd46f7e18d (patch) | |
| tree | 28a4c503c2b8ab1e687e0ca8a0cd24a1918401b1 /nerv/Makefile | |
| parent | b5ca62108775505246f752b9782352b45036ef3c (diff) | |
separate non-Lua part of io code to a dedicated dir; code clean-up
Diffstat (limited to 'nerv/Makefile')
| -rw-r--r-- | nerv/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nerv/Makefile b/nerv/Makefile index b69a63e..4008453 100644 --- a/nerv/Makefile +++ b/nerv/Makefile @@ -1,7 +1,7 @@ .PHONY: build install clean SHELL := /bin/bash BUILD_DIR := $(CURDIR)/build -OBJS := nerv.o luaT.o common.o \ +OBJS := nerv.o lib/luaT/luaT.o lib/io/chunk_file.o common.o \ matrix/mmatrix.o matrix/cumatrix.o matrix/init.o matrix/cukernel.o \ io/init.o io/chunk_file.o \ examples/oop_example.o @@ -19,7 +19,7 @@ INCLUDE += $(CUDA_INCLUDE) LDFLAGS := -L$(CUDA_BASE)/lib64/ -Wl,-rpath=$(CUDA_BASE)/lib64/ -lcudart -lcublas CFLAGS := -Wall -Wextra -O2 OBJ_DIR := $(BUILD_DIR)/objs -SUBDIR := matrix io layer examples nn +SUBDIR := matrix io layer examples nn lib/io lib/luaT NVCC := $(CUDA_BASE)/bin/nvcc NVCC_FLAGS := -Xcompiler -fPIC,-Wall,-Wextra @@ -39,8 +39,8 @@ $(OBJ_DIR)/matrix/cukernel.o: matrix/cukernel.cu $(NVCC) -c -o $@ $< $(INCLUDE) $(NVCC_FLAGS) $(LUA_DIR)/%.lua: %.lua cp $< $@ -$(OBJ_DIR)/luaT.o: - gcc -c -o $@ luaT/luaT.c $(INCLUDE) -fPIC +#$(OBJ_DIR)/luaT.o: +# gcc -c -o $@ luaT/luaT.c $(INCLUDE) -fPIC $(LIBS): $(OBJS) gcc -shared -o $@ $(OBJS) $(LDFLAGS) |