diff --git a/Makefile b/Makefile index c107e1d..bc6cbab 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ standard: @rm -f ./Game/runme.sh @echo "Done deleting files" @echo "Now compiling..." - @make -f block.make + @make -C source/code -f block.make @rm -f *.o @echo "Everything has been compiled!" diff --git a/source/code/block.make b/source/code/block.make index 2246210..b145ec0 100644 --- a/source/code/block.make +++ b/source/code/block.make @@ -1,5 +1,5 @@ -Game/bloackattack: main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o uploadReplay.o - g++ -O -o Game/blockattack main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o `sdl-config --cflags --libs` -lSDL_image -lSDL_mixer -lenet +../../Game/blockattack: main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o uploadReplay.o + g++ -O -o ../../Game/blockattack main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o `sdl-config --cflags --libs` -lSDL_image -lSDL_mixer -lenet main.o: main.cpp BlockGame.hpp mainVars.hpp common.h g++ -g -c main.cpp `sdl-config --cflags` @@ -31,7 +31,7 @@ common.o: common.h common.cc uploadReplay.o: uploadReplay.cc uploadReplay.h g++ -g -c uploadReplay.cc `sdl-config --cflags` -run: Game/bloackattack +run: ../../Game/blockattack clean: rm *o