reverted back to per-entity prethink-think-move-postthink process to fix mods

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 7568ec5d663ed07ea99e3df78ea000de8443ea99..68ffc78619ab26f43a4b66ff092214af9bbe3c4d 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -3,15 +3,17 @@
 # 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=
 
 
@@ -43,7 +45,6 @@ OBJ_COMMON= \
        collision.o \
        common.o \
        console.o \
-       crc.o \
        curves.o \
        cvar.o \
        dpvsimpledecode.o \
@@ -202,7 +203,7 @@ OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND)
 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 -lSDL
+LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs`
 EXE_WINCL=darkplaces.exe
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe