commit d0a0ac11

sago007 · 2008-08-29 14:45
d0a0ac11e592d2fd8f03651cc99fa04fc0be0589 patch · browse files
parent f62f552d61e91e2e4b6362da9fb2c9023d8f3999

make now works


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@33 9d7177f8-192b-0410-8f35-a16a89829b06

Changed files

M	Makefile before
M	source/code/block.make before

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