fix for 16bit textures looking awful (bug in the alpha check for 8bit)

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index c0ac45edc4ae23bac237b48f3625111519adc7a4..7f2ebe5444396578625438897f78ad0840f2f9a5 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
@@ -43,7 +43,7 @@ CLIENTOBJECTS=        cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \
                jpeg.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 \
                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 \
@@ -51,10 +51,10 @@ SHAREDOBJECTS=      builddate.o cmd.o collision.o common.o crc.o cvar.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
+               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
 
 
@@ -72,7 +72,9 @@ 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=
@@ -82,7 +84,7 @@ EXE_DED=darkplaces-dedicated
 
 GLX_LIB=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(SOUNDLIB)
 
-DO_LD=$(CC) -o $@ $^ $(LDFLAGS)
+DO_LD=$(CC) $(LDFLAGS) -o $@ $^
 
 
 ##### Commands #####
@@ -144,7 +146,7 @@ bin-debug :
 #      @echo
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_DEBUG)"
+               LDFLAGS="$(LDFLAGS_DEBUG)"
 
 bin-profile :
        @echo
@@ -155,7 +157,7 @@ bin-profile :
 #      @echo
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_PROFILE)"
+               LDFLAGS="$(LDFLAGS_PROFILE)"
 
 bin-release :
        @echo
@@ -166,7 +168,7 @@ bin-release :
 #      @echo
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_RELEASE)"
+               LDFLAGS="$(LDFLAGS_RELEASE)"
 
 builddate:
        touch builddate.c
@@ -181,11 +183,11 @@ vid_glx.o: vid_glx.c
 
 $(EXE_GLX):  $(OBJ_COMMON) $(OBJ_GLX)
 #      @echo "   Linking  " $@
-       $(DO_LD) $(GLX_LIB)
+       $(DO_LD) $(GLX_LIB) $(LDFLAGS_COMMON)
 
 $(EXE_DED): $(OBJ_COMMON) $(OBJ_DED)
 #      @echo "   Linking  " $@
-       $(DO_LD)
+       $(DO_LD) $(LDFLAGS_COMMON)
 
 clean:
        rm -f $(EXE_GLX) $(EXE_DED) *.o *.d