Rename host_t -> host_static_t.

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 38550197ece1d5a3fd01227151934ff5356be0c9..46aa01075d802036b243d456e2dcab8aeb80311a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -101,6 +101,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=shared
        DP_LINK_ODE?=dlopen
@@ -130,6 +131,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
                CFLAGS_MAKEDEP=
        endif
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=dlopen
        DP_LINK_ODE?=dlopen
@@ -165,6 +167,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=shared
        DP_LINK_ODE?=dlopen
@@ -191,6 +194,7 @@ ifeq ($(DP_MAKE_TARGET), bsd)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=shared
        DP_LINK_JPEG?=shared
        DP_LINK_ODE?=dlopen
@@ -217,7 +221,7 @@ ifeq ($(WIN64RELEASE), 1)
 #      WINDRES=$(TARGET)-windres
 endif
 
-CFLAGS_WARNINGS=-Wall -Werror=c++-compat -Wshadow -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
+CFLAGS_WARNINGS=-Wall -Winline -Werror=c++-compat -Wwrite-strings -Wshadow -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
 
 
 ifeq ($(DP_MAKE_TARGET), mingw)
@@ -236,6 +240,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 
+       DP_LINK_SDL?=shared
        DP_LINK_ZLIB?=dlopen
        DP_LINK_JPEG?=shared
        DP_LINK_ODE?=dlopen
@@ -246,6 +251,13 @@ endif
 
 # set these to "" if you want to use dynamic loading instead
 # zlib
+ifeq ($(DP_LINK_SDL), shared)
+       SDL_LIBS=$(SDLCONFIG_LIBS)
+endif
+ifeq ($(DP_LINK_SDL), static)
+       SDL_LIBS=$(SDLCONFIG_STATICLIBS)
+endif
+
 ifeq ($(DP_LINK_ZLIB), shared)
        CFLAGS_LIBZ=-DLINK_TO_ZLIB
        LIB_Z=-lz
@@ -308,8 +320,10 @@ endif
 
 
 ##### Extra CFLAGS #####
+ifneq ($(CC), tcc)
+       CFLAGS_MAKEDEP?=-MMD
+endif
 
-CFLAGS_MAKEDEP?=-MMD
 ifdef DP_FS_BASEDIR
        CFLAGS_FS=-DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\"
 else