moved savelevel() code to level.h/c where it belongs to. :)

[supertux.git] / Makefile

diff --git a/Makefile b/Makefile
index 181c39b..534e66b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ JOY=YES
 
 #undefine this for non debugging compilation
 
-DEBUG_FLAG=-DDEBUG
+DEBUG_FLAG=-DDEBUG -pg
 
 # Defaults for Linux:
 
@@ -35,7 +35,7 @@ TARGET=supertux
 TARGET_DEF=LINUX
 
 CFLAGS=-Wall -O2 $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-       -D$(NOSOUNDFLAG) -D$(TARGET_DEF) -DJOY_$(JOY) $(DEBUG_FLAG)
+       -D$(NOSOUNDFLAG) -D$(NOOPENGLFLAG) -D$(TARGET_DEF) -DJOY_$(JOY) $(DEBUG_FLAG)
 
 
 # Other definitions:
@@ -43,6 +43,7 @@ CFLAGS=-Wall -O2 $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
 SDL_MIXER=-lSDL_mixer
 SDL_IMAGE=-lSDL_image
 NOSOUNDFLAG=__SOUND
+NOOPENGLFLAG=__OPENGL
 SDL_LIB=$(SDL_MIXER) $(SDL_IMAGE) $(SDL_LDFLAGS) 
 SDL_CFLAGS := $(shell sdl-config --cflags)
 SDL_LDFLAGS := $(shell sdl-config --libs)
@@ -52,7 +53,7 @@ installdat = install -g $(USERNAME) -o $(USERNAME) -m 644
 
 
 OBJECTS=obj/supertux.o obj/setup.o obj/intro.o obj/title.o obj/scene.o obj/collision.o obj/bitmask.o obj/type.o \
-       obj/timer.o obj/texture.o obj/badguy.o obj/special.o  obj/world.o obj/player.o obj/level.o obj/gameloop.o \
+       obj/timer.o obj/text.o obj/texture.o obj/badguy.o obj/special.o  obj/world.o obj/player.o obj/level.o obj/gameloop.o \
        obj/screen.o obj/sound.o obj/high_scores.o obj/menu.o obj/leveleditor.o
 
 # Make commands:
@@ -76,6 +77,12 @@ uninstall:
 nosound:
        make supertux SDL_MIXER= NOSOUNDFLAG=NOSOUND
 
+noopengl:
+       make supertux GL_LIB= NOOPENGLFLAG=NOOPENGL
+       
+nosoundopengl:
+       make supertux GL_LIB= SDL_MIXER= NOSOUNDFLAG=NOSOUND NOOPENGLFLAG=NOOPENGL
+       
 win32:
        make TARGET_DEF=WIN32 TARGET=supertux.exe \
                DATA_PREFIX=data/
@@ -146,6 +153,11 @@ obj/texture.o:     src/texture.c src/texture.h \
                src/setup.h obj/level.o
        $(CC) $(CFLAGS) src/texture.c -c -o obj/texture.o
 
+obj/text.o:    src/text.c src/text.h \
+               src/defines.h src/globals.h src/screen.h src/scene.h src/gameloop.h obj/sound.o \
+               src/setup.h obj/level.o
+       $(CC) $(CFLAGS) src/text.c -c -o obj/text.o
+       
 obj/badguy.o:  src/badguy.c src/badguy.h \
                src/defines.h src/globals.h src/screen.h src/gameloop.h obj/sound.o \
                src/setup.h obj/level.o