-"add color code to start of chat message to prevent nick colors from messing up...

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index f7ab1d9564f6e7ba7436d6fce51080fd350adf22..b4201038e261fc9d5bd3fc30caff4786eebfc6a8 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -122,7 +122,6 @@ OBJ_COMMON= \
        vid_shared.o \
        view.o \
        wad.o \
-       winding.o \
        world.o \
        zone.o
 
@@ -140,16 +139,16 @@ CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=
 
-OPTIM_DEBUG=
+OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
 OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
 
 DO_CC=$(CC) $(CFLAGS) -c $< -o $@
 
 
 # Link
-LDFLAGS_DEBUG=-g -ggdb
-LDFLAGS_PROFILE=-g -pg
-LDFLAGS_RELEASE=
+LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG)
+LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE)
+LDFLAGS_RELEASE=$(OPTIM_RELEASE)
 
 
 ##### UNIX specific variables #####
@@ -190,7 +189,7 @@ OBJ_MACOSXCD=$(OBJ_NOCD)
 # Link
 LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL)
 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
-LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `sdl-config --static-libs`
 
 OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)