model_sprite.o \
netconn.o \
palette.o \
+ polygon.o \
portals.o \
pr_cmds.o \
pr_edict.o \
vid_shared.o \
view.o \
wad.o \
- wavefile.o \
winding.o \
world.o \
zone.o
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
##### 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)
#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
sys_sdl.o: sys_sdl.c
$(DO_CC) `sdl-config --cflags`
+darkplaces.o: %.o : %.rc
+ windres -o $@ $<
+
.c.o:
$(DO_CC)