Added the proper libPNG DLL name for Win64, by Willis

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 58135eab2240af05f1d0ffaa21faab7010b5bde7..7354784eb730b8e07b8bb9f36414b07c9b679130 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -5,6 +5,8 @@ CC=gcc
 #CPUOPTIMIZATIONS=-march=athlon
 # athlon xp optimizations
 #CPUOPTIMIZATIONS=-march=athlon-xp
+# athlon 64 optimizations
+#CPUOPTIMIZATIONS=-march=athlon64 -m32
 # Pentium 3 optimizations
 #CPUOPTIMIZATIONS=-march=pentium3
 # Pentium 4 optimizations
@@ -33,7 +35,7 @@ LIB_SND_ALSA=-lasound
 
 # Core Audio (Mac OS X)
 OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.c
-LIB_SND_COREAUDIO=
+LIB_SND_COREAUDIO=-framework CoreAudio
 
 # BSD / Sun audio API (NetBSD and OpenBSD)
 OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o
@@ -63,10 +65,12 @@ OBJ_COMMON= \
        cl_particles.o \
        cl_screen.o \
        cl_video.o \
+       clvm_cmds.o \
        cmd.o \
        collision.o \
        common.o \
        console.o \
+       csprogs.o \
        curves.o \
        cvar.o \
        dpvsimpledecode.o \
@@ -75,13 +79,13 @@ OBJ_COMMON= \
        fs.o \
        gl_backend.o \
        gl_draw.o \
-       gl_models.o \
        gl_rmain.o \
        gl_rsurf.o \
        gl_textures.o \
        host.o \
        host_cmd.o \
        image.o \
+       image_png.o \
        jpeg.o \
        keys.o \
        lhnet.o \
@@ -122,8 +126,8 @@ OBJ_COMMON= \
        vid_shared.o \
        view.o \
        wad.o \
-       winding.o \
        world.o \
+       world_cs.o \
        zone.o
 
 # note that builddate.c is very intentionally not compiled to a .o before
@@ -135,21 +139,21 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(
 
 # Compilation
 # CFLAGS_COMMON=-MD -Wall -Werror
-CFLAGS_COMMON=-MD -Wall
+CFLAGS_COMMON=-MD -Wall -Wsign-compare
 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 #####
@@ -158,7 +162,12 @@ 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=$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
+ifeq ($(DP_MAKE_TARGET), sunos)
+       LDFLAGS_UNIXCL=-R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND)
+else
+       LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
+endif
+
 LDFLAGS_UNIXSDL=`sdl-config --libs`
 EXE_UNIXCL=darkplaces-glx
 EXE_UNIXSV=darkplaces-dedicated
@@ -169,8 +178,6 @@ CMD_UNIXRM=rm -rf
 
 ##### Linux specific variables #####
 
-DEFAULT_SNDAPI_LINUX=ALSA
-
 # If you want CD sound in Linux
 OBJ_LINUXCD=cd_linux.o
 # If you want no CD audio
@@ -184,28 +191,25 @@ LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
 
 ##### Mac OS X specific variables #####
 
-DEFAULT_SNDAPI_MACOSX=COREAUDIO
-
-# If you want CD sound in Mac OS X
-#OBJ_MACOSXCD=cd_macosx.o
-# If you want no CD audio
+# No CD support available
 OBJ_MACOSXCD=$(OBJ_NOCD)
 
 # Link
-LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL)
+LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework Carbon $(LIB_SOUND)
 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)
 
-##### SunOS specific variables #####
+EXE_MACOSXCL=darkplaces-agl
+
 
-DEFAULT_SNDAPI_SUNOS=OSS
+##### SunOS specific variables #####
 
 # No CD support available
 OBJ_SUNOSCD=$(OBJ_NOCD)
 
-CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP
+CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS
 
 # Link
 LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXCL)
@@ -215,8 +219,6 @@ LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL)
 
 ##### BSD specific variables #####
 
-DEFAULT_SNDAPI_BSD=BSD
-
 #if you want CD sound in BSD
 OBJ_BSDCD=cd_bsd.o
 #if you want no CD audio
@@ -230,8 +232,6 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL)
 
 ##### Win32 specific variables #####
 
-DEFAULT_SNDAPI_WIN32=WIN
-
 #if you want CD sound in Win32
 OBJ_WINCD=cd_win.o
 #if you want no CD audio
@@ -277,16 +277,13 @@ help:
        @echo
 
 debug :
-       $(MAKE) sdl-debug cl-debug sv-debug \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API)
+       $(MAKE) sv-debug cl-debug sdl-debug
 
 profile :
-       $(MAKE) sdl-profile cl-profile sv-profile \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API)
+       $(MAKE) sv-profile cl-profile sdl-profile
 
 release :
-       $(MAKE) sdl-release cl-release sv-release \
-               DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API)
+       $(MAKE) sv-release cl-release sdl-release
 
 cl-debug :
        $(MAKE) bin-debug \