diff --git a/src/makefile b/src/makefile index d04d750f8b8599e822400bb51c490683f4909840..5ba6feb4a78d1a5b143a662e9c4eaf3700884e25 100644 --- a/src/makefile +++ b/src/makefile @@ -1,12 +1,12 @@ -all: *.cpp +source: *.cpp + @echo Compiling sources... @cp ./libtcod/*.so . @g++ -g *.cpp -o RogueReborn.exe -I./libtcod/include -L. -ltcod -ltcodxx -Wl,-rpath=. -Wall -std=c++11 - -default: all test - -tests: - @make -C test + @make source -C test clean: @rm -f RogueReborn.exe *.so @rm -f scores.txt + @make clean -C test + +default: source \ No newline at end of file diff --git a/src/test/armor.test.cpp b/src/test/armor.test.cpp index 077ff74cda3029783b9f36f5159fa17822628b36..7b0da6a3e446d61a3ae42f89f2b1b421284de339 100644 --- a/src/test/armor.test.cpp +++ b/src/test/armor.test.cpp @@ -2,11 +2,11 @@ #include <vector> #include <iostream> -#include "include/armor.h" +#include "../include/armor.h" int main(){ - sd::cout << "Hello" << std::endl; + std::cout << "Hello" << std::endl; } \ No newline at end of file diff --git a/src/test/makefile b/src/test/makefile index 5fe12d1b41cab25a4966765f611a3e343fb23d7f..aff89a1efdd1b3aa999b7ff1f0cb41f1a4a00799 100644 --- a/src/test/makefile +++ b/src/test/makefile @@ -1,5 +1,9 @@ -all: *.cpp - @echo "I'm compiling tests" +source: *.cpp + @echo Compiling tests... + @g++ -g *.cpp -o TestRogueReborn.exe -L. -Wl,-rpath=. -Wall -std=c++11 -default: all \ No newline at end of file +clean: + @rm -f TestRogueReborn.exe + +default: source \ No newline at end of file