From d429aad9f246f8e09f8e4d35e9619777fea56c3b Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 13 Dec 2012 12:41:23 +0000
Subject: [PATCH] Fix building on Linux; fix WITHOUT_GTK=0 build.

git-svn-id: https://svn.eduke32.com/eduke32@3279 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/Makefile.shared | 1 +
 polymer/eduke32/build/src/sdlayer.c   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/polymer/eduke32/build/Makefile.shared b/polymer/eduke32/build/Makefile.shared
index 02e66d915..4192d836c 100644
--- a/polymer/eduke32/build/Makefile.shared
+++ b/polymer/eduke32/build/Makefile.shared
@@ -68,6 +68,7 @@ ifeq ($(SUBPLATFORM),LINUX)
     RENDERTYPE=SDL
     BUILDCOMMONFLAGS+= -DHAVE_INTTYPES
     GTKCOMPAT32=0
+    SDL_FRAMEWORK=0
 
     ifeq ($(findstring x86_64,$(SYSARCH)),x86_64)
         ifeq (1,$(BUILD32_ON_64))
diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index 7abea8026..6ef9e7ae0 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -39,11 +39,11 @@
 # include "gtkbits.h"
 #endif
 
-#if (!defined __APPLE__ && !defined HAVE_GTK2) || (defined __APPLE__) // && defined __BIG_ENDIAN__)
-#undef UNREFERENCED_PARAMETER
-#define UNREFERENCED_PARAMETER(x) x=x
+#if defined __APPLE__ || !defined HAVE_GTK2
+# undef UNREFERENCED_PARAMETER
+# define UNREFERENCED_PARAMETER(x) x=x
 
-# if !defined _WIN32 && !defined OSX_STARTUPWINDOW
+# if !defined _WIN32 && (!defined __APPLE__ || !defined OSX_STARTUPWINDOW)
 int32_t startwin_open(void) { return 0; }
 int32_t startwin_close(void) { return 0; }
 int32_t startwin_puts(const char *s) { UNREFERENCED_PARAMETER(s); return 0; }