# Choose the compiler you want to use
CC=gcc
-# K6/athlon optimizations
-#CPUOPTIMIZATIONS=-march=k6
-# Note: don't use -march=athlon, every gcc which has it currently (2.96-3.1)
-# have optimizer bugs (like entities disappearing randomly - a bug with
-# compiling BOX_ON_PLANE_SIDE in mathlib.h)
+# athlon optimizations
#CPUOPTIMIZATIONS=-march=athlon
-# 686 optimizations
+# athlon xp optimizations
+#CPUOPTIMIZATIONS=-march=athlon-xp
+# Pentium 3 optimizations
+#CPUOPTIMIZATIONS=-march=pentium3
+# Pentium 4 optimizations
+#CPUOPTIMIZATIONS=-march=pentium4
+# 686 (Pentium Pro/II) optimizations
#CPUOPTIMIZATIONS=-march=i686
-# No specific CPU
+# No specific CPU (386 compatible)
CPUOPTIMIZATIONS=
# Sound objects
OBJ_COMMONSOUND=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
OBJ_NOSOUND=snd_null.o
+OBJ_OSSSOUND=$(OBJ_COMMONSOUND) snd_oss.o
+LIB_OSSSOUND=
# CD objects
OBJ_NOCD=cd_null.o
collision.o \
common.o \
console.o \
- crc.o \
curves.o \
cvar.o \
dpvsimpledecode.o \
##### Linux specific variables #####
# Recommended for: anyone not using ALSA
-OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
-LIB_LINUXSOUND=
+OBJ_LINUXSOUND=$(OBJ_OSSSOUND)
+LIB_LINUXSOUND=$(LIB_OSSSOUND)
# Recommended for: anyone using ALSA
#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o
#LIB_LINUXSOUND=-lasound
# Link
LDFLAGS_WINCOMMON=-lwinmm -lwsock32
LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
-LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole -lwinmm -lwsock32
-LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
+LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole
+LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs`
EXE_WINCL=darkplaces.exe
EXE_WINSV=darkplaces-dedicated.exe
EXE_WINSDL=darkplaces-sdl.exe