X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=7589c099f339f446914e8cf9bdbd525649db1a16;hb=c8a2e03b26788ba4d0fccc7c7795b0320dd791c5;hp=9fcea9580bd825c1d940cfddb1208186cad00f31;hpb=95f66338c8144989970daa0fa4b38c87e9af94a0;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.inc b/makefile.inc
index 9fcea958..7589c099 100644
--- 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=
 
 
@@ -167,6 +169,25 @@ LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -ldl
 LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
 
 
+##### Mac OS X specific variables #####
+
+#OBJ_MACOSXSOUND=$(OBJ_COMMONSOUND) snd_coreaudio.c
+OBJ_MACOSXSOUND=$(OBJ_NOSOUND)
+LIB_MACOSXSOUND=
+
+# If you want CD sound in Mac OS X
+#OBJ_MACOSXCD=cd_macosx.o
+# If you want no CD audio
+OBJ_MACOSXCD=$(OBJ_NOCD)
+
+# Link
+LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL)
+LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
+
+OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
+
+
 ##### BSD specific variables #####
 
 OBJ_BSDSOUND=$(OBJ_COMMONSOUND) snd_bsd.o
@@ -200,8 +221,8 @@ OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND)
 # 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 -lSDL
+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