fix two more fs_gamedir mixups (loading saved games should now work, as well as video...

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 29e9b3ca82cd7da24fbc0e5f9aa8ce3d42394c4e..a2c2bd7943be2a2385dbd6feebd6ffecc388e46c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 ##### Variables that you may want to modify #####
 
 #choose the compiler you want to use
-CC=gcc-cvs
+CC=gcc
 
 #recommended for: anyone not using ALSA 0.5
 OBJ_SND=snd_oss.o snd_dma.o snd_mix.o snd_mem.o
@@ -40,21 +40,21 @@ CLIENTOBJECTS=      cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \
                cl_main.o cl_parse.o cl_particles.o cl_screen.o cl_video.o \
                console.o dpvsimpledecode.o fractalnoise.o gl_backend.o \
                gl_draw.o gl_models.o gl_rmain.o gl_rsurf.o gl_textures.o \
-               keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \
-               r_explosion.o r_lerpanim.o r_light.o r_modules.o r_sky.o \
+               jpeg.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \
+               r_lerpanim.o r_light.o r_modules.o r_sky.o \
                r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \
-               r_shadow.c
+               r_shadow.o
 SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o \
                sv_phys.o sv_user.o
 SHAREDOBJECTS= builddate.o cmd.o collision.o common.o crc.o cvar.o \
                filematch.o host.o host_cmd.o image.o mathlib.o matrixlib.o \
                model_alias.o model_brush.o model_shared.o model_sprite.o \
                net_bsd.o net_dgrm.o net_loop.o net_main.o net_master.o \
-               net_udp.o palette.o portals.o protocol.o quakeio.o sys_linux.o \
-               sys_shared.o transform.o world.o wad.o zone.o
+               net_udp.o palette.o portals.o protocol.o fs.o sys_linux.o \
+               sys_shared.o world.o wad.o zone.o
 
 OBJ_COMMON= $(CLIENTOBJECTS) $(SERVEROBJECTS) $(SHAREDOBJECTS)
-OBJ_GLX= vid_glx.c $(OBJ_CD) $(OBJ_SND)
+OBJ_GLX= vid_glx.o $(OBJ_CD) $(OBJ_SND)
 OBJ_DED= vid_null.o cd_null.o snd_null.o
 
 
@@ -65,14 +65,15 @@ CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=
 
 OPTIM_DEBUG=
-OPTIM_RELEASE= -O6 -fno-strict-aliasing -ffast-math -funroll-loops \
-               -fexpensive-optimizations $(CPUOPTIMIZATIONS)
+OPTIM_RELEASE= -O9 -fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS)
 
 DO_CC=$(CC) $(CFLAGS) -c $< -o $@
 
 
 # Link
-LDFLAGS_COMMON=-lm -ldl
+# LordHavoc note: I have been informed that system libraries must come last
+# on the linker line, and that -lm must always be last
+LDFLAGS_COMMON=-ldl -lm
 LDFLAGS_DEBUG=-g -ggdb
 LDFLAGS_PROFILE=-g -pg
 LDFLAGS_RELEASE=
@@ -138,53 +139,41 @@ ded-release :
 bin-debug :
        @echo
        @echo "========== $(EXE) (debug) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_DEBUG) \
-#                                    $(OPTIM_DEBUG)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_DEBUG)"
+               LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
 
 bin-profile :
        @echo
        @echo "========== $(EXE) (profile) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_PROFILE) \
-#                                    $(OPTIM_RELEASE)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_PROFILE)"
+               LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
 
 bin-release :
        @echo
        @echo "========== $(EXE) (release) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_RELEASE) \
-#                                    $(OPTIM_RELEASE)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_RELEASE)"
+               LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
+       strip $(EXE)
 
 builddate:
        touch builddate.c
 
 vid_glx.o: vid_glx.c
-#      @echo "   Compiling" $<
        $(DO_CC) -I/usr/X11R6/include
 
 .c.o:
-#      @echo "   Compiling" $<
        $(DO_CC)
 
 $(EXE_GLX):  $(OBJ_COMMON) $(OBJ_GLX)
-#      @echo "   Linking  " $@
        $(DO_LD) $(GLX_LIB)
 
 $(EXE_DED): $(OBJ_COMMON) $(OBJ_DED)
-#      @echo "   Linking  " $@
        $(DO_LD)
 
 clean: