diff options
| -rwxr-xr-x[-rw-r--r--] | README.md | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | makefile | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/README.md b/README.md index 63274f5..a3a062d 100644..100755 --- a/README.md +++ b/README.md @@ -79,6 +79,9 @@ that matches these patterns will get compiled in: - `src/[your_login]/test_mips_*/*.cpp` (if any) +_Original makefile also included another pattern (thanks to @lorenzo2897, see + [issue #21](https://github.com/m8pple/arch2-2016-cw/issues/21)._ + You can also add your own private header files (often a good idea), which should be part of the submitted zip file, @@ -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)) |