diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | Simulator/makefile | 31 |
2 files changed, 32 insertions, 6 deletions
@@ -14,4 +14,9 @@ Simulator/Release Testing/x64 Testing/Debug -Testing/LastCoverageResults.log
\ No newline at end of file +Testing/LastCoverageResults.log + +*.o +Simulator/simulator +*.user +Simulator/external/
\ No newline at end of file diff --git a/Simulator/makefile b/Simulator/makefile index 55cea72e..9a2e6d2c 100644 --- a/Simulator/makefile +++ b/Simulator/makefile @@ -1,7 +1,10 @@ -CC=g++ -CFLAGS=-std=c++14 -Iinclude -ldl -lpthread +CXX=g++-6 +CC=gcc-6 + +CFLAGS = -std=c++14 -Iinclude -lpthread -ldl + SOURCE=\ -external/sqlite3.o\ +sqlite3.o\ src/Simulator.cpp\ src/database/Database.cpp \ src/simulation/workloads/Workload.cpp\ @@ -12,6 +15,24 @@ src/modeling/machine/Machine.cpp\ src/modeling/Entity.cpp\ src/modeling/Rack.cpp +all: sqlite simulator + +clean: + rm -rf simulator external/ + +simulator: + $(CXX) -o simulator -Iexternal $(SOURCE) $(CFLAGS) + +sqlite: + cd ../external/sqlite ; \ + git rev-parse --git-dir >/dev/null || exit 1 ; \ + git log -1 --format=format:%ci%n | sed -e 's/ [-+].*$//;s/ /T/;s/^/D /' > manifest ; \ + echo $(git log -1 --format=format:%H) > manifest.uuid + mkdir external + cd external ; \ + ./../../external/sqlite/configure ; \ + make sqlite3.o + mv external/sqlite3.o sqlite3.o + rm -rf external/ -simulatormake: - $(CC) -o simulator $(SOURCE) $(CFLAGS) +.PHONY: all, clean
\ No newline at end of file |