diff options
| author | John Hodge <tpg@mutabah.net> | 2018-03-18 10:48:26 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2018-03-18 10:48:26 +0800 |
| commit | 5b0450395af81ceba0d0ac27fc73b16f966bd7d3 (patch) | |
| tree | e3c753b83a562be78cdbd74b8164dab785bf07a6 /tools/testrunner | |
| parent | 363e6fa172f787e970c8abc8f631b6d60d571248 (diff) | |
| download | mrust-5b0450395af81ceba0d0ac27fc73b16f966bd7d3.tar.gz | |
All - Move toml parser and path header to a common library, start on custom target specs.
Diffstat (limited to 'tools/testrunner')
| -rw-r--r-- | tools/testrunner/Makefile | 4 | ||||
| -rw-r--r-- | tools/testrunner/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/testrunner/Makefile b/tools/testrunner/Makefile index 1285d732..7107eaf2 100644 --- a/tools/testrunner/Makefile +++ b/tools/testrunner/Makefile @@ -26,8 +26,8 @@ $(OBJDIR)%.o: %.cpp @mkdir -p $(dir $@) @echo [CXX] $< $V$(CXX) -o $@ -c $< $(CXXFLAGS) -MMD -MP -MF $@.dep -# - Include files from minicargo -$(OBJDIR)%.o: ../minicargo/%.cpp +# - Include files from common (TODO: Be less hacky) +$(OBJDIR)%.o: ../common/%.cpp @mkdir -p $(dir $@) @echo [CXX] $< $V$(CXX) -o $@ -c $< $(CXXFLAGS) -MMD -MP -MF $@.dep diff --git a/tools/testrunner/main.cpp b/tools/testrunner/main.cpp index 2aa7e696..63391fc5 100644 --- a/tools/testrunner/main.cpp +++ b/tools/testrunner/main.cpp @@ -7,8 +7,8 @@ #include <vector> #include <fstream> #include <cctype> // std::isblank -#include "../minicargo/debug.h" -#include "../minicargo/path.h" +#include "../common/debug.h" +#include "../common/path.h" #ifdef _WIN32 # include <Windows.h> # define MRUSTC_PATH "x64\\Release\\mrustc.exe" |