File darkplaces-makefile.patch of Package darkplaces

Overview Repositories Revisions Requests Users Attributes Meta

File darkplaces-makefile.patch of Package darkplaces

diff -Naur darkplaces-rev20140513.orig/makefile darkplaces-rev20140513/makefile
--- darkplaces-rev20140513.orig/makefile	2015-06-16 16:01:11.438903662 +0200
+++ darkplaces-rev20140513/makefile	2015-06-16 16:40:53.929164692 +0200
@@ -295,6 +295,16 @@
 	LIB_Z=
 endif
 
+# vorbis
+ifeq ($(DP_LINK_VORBIS), shared)
+	CFLAGS_LIBVORBIS=-DLINK_TO_LIBVORBIS
+	LIB_VORBIS=-lvorbisfile -lvorbis
+endif
+ifeq ($(DP_LINK_VORBIS), dlopen)
+	CFLAGS_LIBVORBIS=
+	LIB_VORBIS=
+endif
+
 # jpeg
 ifeq ($(DP_LINK_JPEG), shared)
 	CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
diff -Naur darkplaces-rev20140513.orig/makefile.inc darkplaces-rev20140513/makefile.inc
--- darkplaces-rev20140513.orig/makefile.inc	2015-06-16 16:01:14.739859687 +0200
+++ darkplaces-rev20140513/makefile.inc	2015-06-16 16:26:38.436567020 +0200
@@ -172,7 +172,7 @@
 
 
 # Compilation
-CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_LIBVORBIS) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
 CFLAGS_CLIENT=-DCONFIG_MENU -DCONFIG_CD $(CFLAGS_VIDEO_CAPTURE)
 CFLAGS_SERVER=
 CFLAGS_DEBUG=-ggdb
@@ -205,7 +205,7 @@
 
 OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
 
-LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
+LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_VORBIS) $(LIB_CRYPTO) $(LIB_GMP) $(LIB_CRYPTO_RIJNDAEL)
 LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND)
 LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
 LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl

Places

File darkplaces-makefile.patch of Package darkplaces

Places