From a1e9bc7430ca827808a502f455b20a23ba15e31a Mon Sep 17 00:00:00 2001 From: oroborus Date: Thu, 22 May 2008 20:13:25 +0000 Subject: - dopisany skutocny ID manager - objekt wall je ako modul - oprava chyby, pri prepinani screenov sa nevyprazdnoval layer - oprava chyby, pri odstraneni vsetkych obrazkov zo skupiny sa odstrani iba prvy obrazok - oprava chyby, pri odstraneni vsetkej hudby zo skupiny sa odstrani iba prva hudba PS: (asi) zajtra ten kod trochu esteticky upravim git-svn-id: http://opensvn.csie.org/tuxanci_ng@53 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index ab243b6..25db7f8 100755 --- a/src/Makefile +++ b/src/Makefile @@ -9,9 +9,10 @@ CFLAGS = -g -O0 -std=c99 -I../include -Wall `sdl-config --cflags` BUILD_DIR = . LIBS = `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_net -FILES = interface.o font.o list.o modules.o image.o layer.o director.o configFile.o tux.o main.o \ - screen.o screen_world.o wall.o shot.o myTimer.o panel.o net_multiplayer.o \ - buffer.o dynamicInt.o arena.o arenaFile.o textFile.o audio.o sound.o music.o gun.o \ +FILES = interface.o idManager.o checkFront.o font.o list.o modules.o image.o layer.o director.o\ + configFile.o tux.o main.o \ + screen.o screen_world.o shot.o myTimer.o panel.o net_multiplayer.o \ + buffer.o arena.o arenaFile.o textFile.o audio.o sound.o music.o gun.o \ item.o widget_label.o screen_mainMenu.o widget_button.o screen_analyze.o widget_textfield.o \ widget_check.o widget_image.o screen_setting.o screen_gameType.o screen_choiceArena.o \ widget_buttonimage.o screen_credits.o homeDirector.o screen_table.o \ @@ -29,6 +30,12 @@ interface.o: interface.c ../include/interface.h modules.o: modules.c ../include/modules.h $(CC) $(CFLAGS) -o $(BUILD_DIR)/modules.o -c modules.c +idManager.o: idManager.c ../include/idManager.h + $(CC) $(CFLAGS) -o $(BUILD_DIR)/idManager.o -c idManager.c + +checkFront.o: checkFront.c ../include/checkFront.h + $(CC) $(CFLAGS) -o $(BUILD_DIR)/checkFront.o -c checkFront.c + font.o: font.c ../include/font.h $(CC) $(CFLAGS) -o $(BUILD_DIR)/font.o -c font.c @@ -56,8 +63,8 @@ screen.o: screen.c ../include/screen.h screen_world.o: screen_world.c ../include/screen_world.h $(CC) $(CFLAGS) -o $(BUILD_DIR)/screen_world.o -c screen_world.c -wall.o: wall.c ../include/wall.h - $(CC) $(CFLAGS) -o $(BUILD_DIR)/wall.o -c wall.c +#wall.o: wall.c ../include/wall.h +# $(CC) $(CFLAGS) -o $(BUILD_DIR)/wall.o -c wall.c shot.o: shot.c ../include/shot.h $(CC) $(CFLAGS) -o $(BUILD_DIR)/shot.o -c shot.c @@ -95,9 +102,6 @@ network.o: network.c ../include/network.h net_multiplayer.o: net_multiplayer.c ../include/net_multiplayer.h $(CC) $(CFLAGS) -o $(BUILD_DIR)/net_multiplayer.o -c net_multiplayer.c -dynamicInt.o: dynamicInt.c ../include/dynamicInt.h - $(CC) $(CFLAGS) -o $(BUILD_DIR)/dynamicInt.o -c dynamicInt.c - arena.o: arena.c ../include/arena.h $(CC) $(CFLAGS) -o $(BUILD_DIR)/arena.o -c arena.c -- cgit v1.2.3