PROPERLY load the icon in SDL/X11

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index 86c5d28f9922f3d5f4ab726932c88732abd88536..5c7e050ff539209892f34290c042ff6f61880936 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -7,11 +7,10 @@ DP_MAKE_TARGET=bsd
 .endif
 DP_ARCH != uname
 
-
 # Command used to delete files
 CMD_RM=$(CMD_UNIXRM)
 
-UNIX_X11LIBPATH=-L/usr/X11R6/lib
+UNIX_X11LIBPATH=/usr/X11R6/lib
 
 # BSD configuration
 .if $(DP_MAKE_TARGET) == "bsd"
@@ -30,6 +29,11 @@ OBJ_ICON_NEXUIZ=
 
 LDFLAGS_CL=$(LDFLAGS_BSDCL)
 LDFLAGS_SV=$(LDFLAGS_BSDSV)
+LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
+
+SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11)
+SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
+SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
 
 EXE_CL=$(EXE_UNIXCL)
 EXE_SV=$(EXE_UNIXSV)
@@ -66,20 +70,38 @@ LIB_SOUND=$(LIB_SND_BSD)
 .endif
 
 
+##### Extra CFLAGS #####
+
+CFLAGS_MAKEDEP=-MD
+.ifdef DP_FS_BASEDIR
+CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"'
+.else
+CFLAGS_FS=
+.endif
+
+CFLAGS_PRELOAD=
+.ifdef DP_PRELOAD_DEPENDENCIES
+LDFLAGS_CL+=$(LDFLAGS_UNIXCL_PRELOAD)
+LDFLAGS_SV+=$(LDFLAGS_UNIXSV_PRELOAD)
+LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD)
+CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
+.endif
+
+.ifdef DP_LINK_TO_LIBJPEG
+LDFLAGS_LIBJPEG?=-ljpeg
+LDFLAGS_CL+=$(LDFLAGS_LIBJPEG)
+LDFLAGS_SV+=$(LDFLAGS_LIBJPEG)
+LDFLAGS_SDL+=$(LDFLAGS_LIBJPEG)
+CFLAGS_PRELOAD+=$(CFLAGS_LIBJPEG) -DLINK_TO_LIBJPEG
+.endif
+
+
 ##### BSD Make specific definitions #####
 
-MAKE:=$(MAKE) -f makefile.bsd
+MAKE:=$(MAKE) -f BSDmakefile
 
 DO_LD=$(CC) -o $@ $> $(LDFLAGS)
 
 
 ##### Definitions shared by all makefiles #####
 .include "makefile.inc"
-
-
-##### Dependency files #####
-
-DEPEND_FILES != ls *.d
-.for i in $(DEPEND_FILES)
-.      include "$i"
-.endfor