All pastes #2056994 Raw Edit

Stuff

public diff v1 · immutable
#2056994 ·published 2011-05-11 20:04 UTC
rendered paste body
diff -Nru eduke32_20110508-1878_orig/Makefile eduke32_20110508-1878/MakefileThere is no dl library.--- Makefile	Wed May 11 15:03:02 2011+++ Makefile	Wed May 11 15:05:15 2011@@ -56,7 +56,11 @@     EOBJ=eobj_win     LIBS+= $(L_SSP) -Wl,--enable-auto-import else-    LIBS+= -ldl -pthread+    ifeq ($(PLATFORM),LINUX)+        LIBS+= -ldl -pthread+    else+        LIBS+= -pthread+    endif     ifneq (0,$(PROFILER))         LIBS+= -lprofiler         debug+= -pgdiff -Nru eduke32_20110508-1878_orig/Makefile.common eduke32_20110508-1878/Makefile.commonThis would be a better default, change it back to 1 when you guys finally release.--- Makefile.common	Wed May 11 15:03:02 2011+++ Makefile.common	Wed May 11 15:18:30 2011@@ -3,7 +3,7 @@ ## source/jaudiolib/Makefile  # Use colored output-PRETTY_OUTPUT ?= 1+PRETTY_OUTPUT ?= 0  # DirectX SDK location - if nonempty, overrides the DXROOTs of the individual # Makefiles. Should be set to an absolute path since this Makefile is includeddiff -Nru eduke32_20110508-1878_orig/build/Makefile.shared eduke32_20110508-1878/build/Makefile.shared--- build/Makefile.shared	Wed May 11 15:03:01 2011+++ build/Makefile.shared	Wed May 11 15:08:36 2011@@ -110,6 +110,13 @@ ifeq ($(PLATFORM),BSD)     RENDERTYPE=SDL     BUILDCFLAGS+= -DHAVE_INTTYPES+    ifeq ($(findstring i386, $(shell uname -m)), i386)+        NOASM=0+    else+        override NOASM=1+    endif+    override NEDMALLOC=0+    STDCPPLIB=-lstdc++ endif ifeq ($(PLATFORM),BEOS)     RENDERTYPE=SDLdiff -Nru eduke32_20110508-1878_orig/build/src/glbuild.c eduke32_20110508-1878/build/src/glbuild.cRuntime linker should decide the major number, chosing for everyone isn't portable.--- build/src/glbuild.c	Wed May 11 15:03:01 2011+++ build/src/glbuild.c	Wed May 11 15:09:21 2011@@ -331,7 +331,7 @@ #elif defined __APPLE__         driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; #else-        driver = "libGL.so.1";+        driver = "libGL.so"; #endif     } @@ -922,7 +922,7 @@ #elif defined __APPLE__         driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; // FIXME: like I know anything about Apple.  Hah. #else-        driver = "libGLU.so.1";+        driver = "libGLU.so"; #endif     } diff -Nru eduke32_20110508-1878_orig/build/src/sdlayer.c eduke32_20110508-1878/build/src/sdlayer.c--- build/src/sdlayer.c	Wed May 11 15:03:01 2011+++ build/src/sdlayer.c	Wed May 11 15:14:37 2011@@ -230,7 +230,8 @@  static void attach_debugger_here(void) {} -#ifdef __GNUC__+/* XXX: libexecinfo could be used on systems without gnu libc. */+#if defined __GNUC__ && defined __linux__ # define PRINTSTACKONSEGV 1 # include <execinfo.h> #endifdiff -Nru eduke32_20110508-1878_orig/source/enet/src/unix.c eduke32_20110508-1878/source/enet/src/unix.c--- source/enet/src/unix.c	Wed May 11 15:03:01 2011+++ source/enet/src/unix.c	Wed May 11 15:16:37 2011@@ -30,9 +30,12 @@ #include <sys/poll.h> #endif +/* XXX: Why is this here? breaks build on BSD. */+/* #ifndef __socklen_t_defined typedef int socklen_t; #endif+*/  #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0diff -Nru eduke32_20110508-1878_orig/source/jaudiolib/Makefile eduke32_20110508-1878/source/jaudiolib/MakefileShouldn't stuff like this be resolved earlier?--- source/jaudiolib/Makefile	Wed May 11 15:03:02 2011+++ source/jaudiolib/Makefile	Wed May 11 15:17:45 2011@@ -16,7 +16,7 @@ CFLAGS=$(BASECFLAGS) $(F_NO_STACK_PROTECTOR) # for BUILD_ECHOFLAGS: OURCFLAGS=$(CFLAGS)-CPPFLAGS=-I$(INC) -I$(SRC) -DHAVE_VORBIS+CPPFLAGS=-I$(INC) -I$(SRC) `pkg-config --cflags vorbis` -DHAVE_VORBIS  ifeq ($(PLATFORM),DARWIN)     ifeq (1,$(SDL_FRAMEWORK))