diff options
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/src/Makefile b/src/Makefile index bb15b25..910be60 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,10 +1,10 @@ -CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math +CXXFLAGS= -O3 -g -fomit-frame-pointer -ffast-math override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') PLATFORM_PREFIX= native -INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include +INCLUDES= -Ishared -Iengine -Ifpsgame STRIP= ifeq (,$(findstring -g,$(CXXFLAGS))) @@ -90,7 +90,6 @@ CLIENT_OBJS= \ engine/client.o \ engine/command.o \ engine/console.o \ - engine/cubeloader.o \ engine/decal.o \ engine/dynlight.o \ engine/glare.o \ @@ -125,8 +124,6 @@ CLIENT_OBJS= \ fpsgame/client.o \ fpsgame/entities.o \ fpsgame/fps.o \ - fpsgame/monster.o \ - fpsgame/movable.o \ fpsgame/render.o \ fpsgame/scoreboard.o \ fpsgame/server.o \ @@ -200,16 +197,16 @@ master: $(MASTER_OBJS) install: all else -client: libenet $(CLIENT_OBJS) +client: $(CLIENT_OBJS) $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) ifneq (,$(findstring DARWIN,$(PLATFORM))) install_name_tool -add_rpath @executable_path/../Frameworks sauer_client endif -server: libenet $(SERVER_OBJS) +server: $(SERVER_OBJS) $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) -master: libenet $(MASTER_OBJS) +master: $(MASTER_OBJS) $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) shared/cube2font.o: shared/cube2font.c @@ -232,10 +229,6 @@ endif endif endif -enet/libenet.a: - $(MAKE) -C enet CC='$(CC)' AR='$(AR)' -libenet: enet/libenet.a - depend: makedepend -Y -Ishared -Iengine -Ifpsgame $(CLIENT_OBJS:.o=.cpp) makedepend -a -o.h.gch -Y -Ishared -Iengine -Ifpsgame $(CLIENT_PCH:.h.gch=.h) @@ -294,12 +287,6 @@ engine/console.o: shared/ents.h shared/command.h shared/glexts.h engine/console.o: shared/glemu.h shared/iengine.h shared/igame.h engine/console.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h engine/console.o: engine/texture.h engine/model.h -engine/cubeloader.o: engine/engine.h shared/cube.h shared/tools.h -engine/cubeloader.o: shared/geom.h shared/ents.h shared/command.h -engine/cubeloader.o: shared/glexts.h shared/glemu.h shared/iengine.h -engine/cubeloader.o: shared/igame.h engine/world.h engine/octa.h -engine/cubeloader.o: engine/lightmap.h engine/bih.h engine/texture.h -engine/cubeloader.o: engine/model.h engine/decal.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h engine/decal.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h engine/decal.o: shared/iengine.h shared/igame.h engine/world.h engine/octa.h @@ -384,9 +371,8 @@ engine/rendermodel.o: shared/glexts.h shared/glemu.h shared/iengine.h engine/rendermodel.o: shared/igame.h engine/world.h engine/octa.h engine/rendermodel.o: engine/lightmap.h engine/bih.h engine/texture.h engine/rendermodel.o: engine/model.h engine/ragdoll.h engine/animmodel.h -engine/rendermodel.o: engine/vertmodel.h engine/skelmodel.h engine/md2.h +engine/rendermodel.o: engine/vertmodel.h engine/skelmodel.h engine/rendermodel.o: engine/md3.h engine/md5.h engine/obj.h engine/smd.h -engine/rendermodel.o: engine/iqm.h engine/renderparticles.o: engine/engine.h shared/cube.h shared/tools.h engine/renderparticles.o: shared/geom.h shared/ents.h shared/command.h engine/renderparticles.o: shared/glexts.h shared/glemu.h shared/iengine.h @@ -465,7 +451,6 @@ fpsgame/ai.o: shared/iengine.h shared/igame.h fpsgame/ai.h fpsgame/client.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h fpsgame/client.o: shared/ents.h shared/command.h shared/glexts.h fpsgame/client.o: shared/glemu.h shared/iengine.h shared/igame.h fpsgame/ai.h -fpsgame/client.o: fpsgame/capture.h fpsgame/ctf.h fpsgame/collect.h fpsgame/entities.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h fpsgame/entities.o: shared/ents.h shared/command.h shared/glexts.h fpsgame/entities.o: shared/glemu.h shared/iengine.h shared/igame.h @@ -473,14 +458,6 @@ fpsgame/entities.o: fpsgame/ai.h fpsgame/fps.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h fpsgame/fps.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h fpsgame/fps.o: shared/iengine.h shared/igame.h fpsgame/ai.h -fpsgame/monster.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h -fpsgame/monster.o: shared/ents.h shared/command.h shared/glexts.h -fpsgame/monster.o: shared/glemu.h shared/iengine.h shared/igame.h -fpsgame/monster.o: fpsgame/ai.h -fpsgame/movable.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h -fpsgame/movable.o: shared/ents.h shared/command.h shared/glexts.h -fpsgame/movable.o: shared/glemu.h shared/iengine.h shared/igame.h -fpsgame/movable.o: fpsgame/ai.h fpsgame/render.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h fpsgame/render.o: shared/ents.h shared/command.h shared/glexts.h fpsgame/render.o: shared/glemu.h shared/iengine.h shared/igame.h fpsgame/ai.h @@ -491,7 +468,6 @@ fpsgame/scoreboard.o: shared/igame.h fpsgame/ai.h fpsgame/server.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h fpsgame/server.o: shared/ents.h shared/command.h shared/glexts.h fpsgame/server.o: shared/glemu.h shared/iengine.h shared/igame.h fpsgame/ai.h -fpsgame/server.o: fpsgame/capture.h fpsgame/ctf.h fpsgame/collect.h fpsgame/server.o: fpsgame/extinfo.h fpsgame/aiman.h fpsgame/waypoint.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h fpsgame/waypoint.o: shared/ents.h shared/command.h shared/glexts.h @@ -537,8 +513,7 @@ fpsgame/entities-standalone.o: shared/iengine.h shared/igame.h fpsgame/ai.h fpsgame/server-standalone.o: fpsgame/game.h shared/cube.h shared/tools.h fpsgame/server-standalone.o: shared/geom.h shared/ents.h shared/command.h fpsgame/server-standalone.o: shared/iengine.h shared/igame.h fpsgame/ai.h -fpsgame/server-standalone.o: fpsgame/capture.h fpsgame/ctf.h -fpsgame/server-standalone.o: fpsgame/collect.h fpsgame/extinfo.h +fpsgame/server-standalone.o: fpsgame/extinfo.h fpsgame/server-standalone.o: fpsgame/aiman.h engine/master-standalone.o: shared/cube.h shared/tools.h shared/geom.h engine/master-standalone.o: shared/ents.h shared/command.h shared/iengine.h |