aboutsummaryrefslogtreecommitdiffstats
path: root/makefile
diff options
context:
space:
mode:
authorDavid Thomas <dt10@imperial.ac.uk>2016-10-16 17:45:40 +0100
committerDavid Thomas <dt10@imperial.ac.uk>2016-10-16 17:45:40 +0100
commit799cc813011a043cc4197dffc54747d5c85508f5 (patch)
tree603b9e76dbb657d811542240c22e1332eb2bfc66 /makefile
parent0673cc3651b60203b90eccdc1c5af5e455f4b6fb (diff)
downloadMipsCPU-799cc813011a043cc4197dffc54747d5c85508f5.tar.gz
MipsCPU-799cc813011a043cc4197dffc54747d5c85508f5.zip
Updated makefile patterns. Closes #21. Thansk to @lorenzo2897
Diffstat (limited to 'makefile')
-rwxr-xr-x[-rw-r--r--]makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/makefile b/makefile
index 2f38cb0..5cb27a5 100644..100755
--- a/makefile
+++ b/makefile
@@ -21,12 +21,16 @@ DEFAULT_OBJECTS = \
USER_CPU_SRCS = \
$(wildcard src/$(LOGIN)/mips_cpu.cpp) \
$(wildcard src/$(LOGIN)/mips_cpu_*.cpp) \
- $(wildcard src/$(LOGIN)/mips_cpu/*.cpp)
+ $(wildcard src/$(LOGIN)/mips_cpu/*.cpp) \
+ $(wildcard src/$(LOGIN)/mips_cpu_*/*.cpp)
+
USER_TEST_SRCS = \
$(wildcard src/$(LOGIN)/test_mips.cpp) \
$(wildcard src/$(LOGIN)/test_mips_*.cpp) \
- $(wildcard src/$(LOGIN)/test_mips/*.cpp)
+ $(wildcard src/$(LOGIN)/test_mips/*.cpp) \
+ $(wildcard src/$(LOGIN)/test_mips_*/*.cpp)
+
USER_CPU_OBJECTS = $(patsubst %.cpp,%.o,$(USER_CPU_SRCS))
USER_TEST_OBJECTS = $(patsubst %.cpp,%.o,$(USER_TEST_SRCS))