now compiles on x86_64 successfully (still a crash regarding progs strings to fix...

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 38edb305d7f5b4658555f06311d37d736a1ba527..4443fd0f4f287e0c941089597d6eb42fded32217 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -18,15 +18,15 @@ CPUOPTIMIZATIONS=
 ##### Variables that you shouldn't care about #####
 
 # Sound objects
-OBJ_COMMONSOUND=ogg.o snd_dma.o snd_mem.o snd_mix.o
+OBJ_COMMONSOUND=snd_dma.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
 OBJ_NOSOUND=snd_null.o
 
 # CD objects
-OBJ_COMMONCD=cd_shared.o
 OBJ_NOCD=cd_null.o
 
 # Common objects
 OBJ_COMMON= \
+       cd_shared.o \
        cgame.o \
        cgamevm.o \
        cl_collision.o \
@@ -70,6 +70,7 @@ OBJ_COMMON= \
        model_sprite.o \
        netconn.o \
        palette.o \
+       polygon.o \
        portals.o \
        pr_cmds.o \
        pr_edict.o \
@@ -97,7 +98,6 @@ OBJ_COMMON= \
        vid_shared.o \
        view.o \
        wad.o \
-       wavefile.o \
        winding.o \
        world.o \
        zone.o
@@ -117,7 +117,7 @@ CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=
 
 OPTIM_DEBUG=
-OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS)
+OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
 
 DO_CC=$(CC) $(CFLAGS) -c $< -o $@
 
@@ -133,7 +133,8 @@ LDFLAGS_RELEASE=
 OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
 
 LDFLAGS_UNIXCOMMON=-lm
-LDFLAGS_UNIXCL=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
+#LDFLAGS_UNIXCL=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
+LDFLAGS_UNIXCL=$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
 LDFLAGS_UNIXSDL=`sdl-config --libs`
 EXE_UNIXCL=darkplaces-glx
 EXE_UNIXSV=darkplaces-dedicated
@@ -144,21 +145,18 @@ CMD_UNIXRM=rm -rf
 
 ##### Linux specific variables #####
 
-# Recommended for: anyone not using ALSA 0.5
+# Recommended for: anyone not using ALSA
 OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
 LIB_LINUXSOUND=
-# Recommended for: anyone using ALSA 0.5
-#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa_0_5.o
-#LIB_LINUXSOUND=-lasound
-# Recommended for: no one (this driver needs to be updated, it doesn't compile anymore)
-#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa_0_9.o
+# Recommended for: anyone using ALSA
+#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o
 #LIB_LINUXSOUND=-lasound
 # Recommended for: anyone who can't use the above drivers
 #OBJ_LINUXSOUND=$(OBJ_NOSOUND)
 #LIB_LINUXSOUND=
 
 # If you want CD sound in Linux
-OBJ_LINUXCD=$(OBJ_COMMONCD) cd_linux.o
+OBJ_LINUXCD=cd_linux.o
 # If you want no CD audio
 #OBJ_LINUXCD=$(OBJ_NOCD)
 
@@ -175,7 +173,7 @@ OBJ_BSDSOUND=$(OBJ_COMMONSOUND) snd_bsd.o
 LIB_BSDSOUND=
 
 #if you want CD sound in BSD
-OBJ_BSDCD=$(OBJ_COMMONCD) cd_bsd.o
+OBJ_BSDCD=cd_bsd.o
 #if you want no CD audio
 #OBJ_BSDCD=$(OBJ_NOCD)
 
@@ -192,11 +190,11 @@ OBJ_WINSOUND=$(OBJ_COMMONSOUND) snd_win.o
 LIB_WINSOUND=
 
 #if you want CD sound in Win32
-OBJ_WINCD=$(OBJ_COMMONCD) cd_win.o
+OBJ_WINCD=cd_win.o
 #if you want no CD audio
 #OBJ_WINCD=$(OBJ_NOCD)
 
-OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND) $(OBJ_WINCD) $(OBJ_COMMON)
+OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND) $(OBJ_WINCD) $(OBJ_COMMON)
 
 # Link
 LDFLAGS_WINCOMMON=-lwinmm -lwsock32
@@ -311,6 +309,9 @@ vid_sdl.o: vid_sdl.c
 sys_sdl.o: sys_sdl.c
        $(DO_CC) `sdl-config --cflags`
 
+darkplaces.o: %.o : %.rc
+       windres -o $@ $<
+
 .c.o:
        $(DO_CC)