From 9704ade66c5387028213f88c947c10478ee9c850 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Fri, 17 Aug 2007 19:32:56 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@557
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/build/Makefile           |  2 ++
 polymer/build/Makefile.shared    | 13 +++++++++----
 polymer/eduke32/Makefile         |  1 +
 polymer/eduke32/source/grpscan.c |  4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/polymer/build/Makefile b/polymer/build/Makefile
index 35e0c90f6..b6b00378d 100644
--- a/polymer/build/Makefile
+++ b/polymer/build/Makefile
@@ -11,12 +11,14 @@
 #  POLYMOST       - enables Polymost renderer
 #  USE_OPENGL     - enables OpenGL support in Polymost
 #  NOASM          - disables the use of inline assembly pragmas
+#  LINKED_GTK     - enables compile-time linkage to GTK
 #
 
 SUPERBUILD ?= 1
 POLYMOST ?= 1		
 USE_OPENGL ?= 1
 NOASM ?= 0
+LINKED_GTK ?= 0
 
 # Debugging options
 #  RELEASE - 1 = no debugging
diff --git a/polymer/build/Makefile.shared b/polymer/build/Makefile.shared
index e0070b3f6..a2d0911e7 100644
--- a/polymer/build/Makefile.shared
+++ b/polymer/build/Makefile.shared
@@ -113,10 +113,12 @@ ifeq ($(RENDERTYPE),SDL)
 			# on my 64bit Gentoo box I have Cairo enabled which means the libs list includes
 			# -lpangocairo-1.0 and -lcairo, however the 32bit compatibility libraries don't
 			# include cairo, so we need to filter out those -l switches in order to link
-			ifeq ($(GTKCOMPAT32),1)
-			#	LIBS+= $(shell pkg-config --libs gtk+-2.0 | sed 's/\s-l\(pango\)\{0,1\}cairo\S*\s/ /g')
-			else
-			#	LIBS+= $(shell pkg-config --libs gtk+-2.0)
+			ifneq ($(LINKED_GTK),0)
+				ifeq ($(GTKCOMPAT32),1)
+					LIBS+= $(shell pkg-config --libs gtk+-2.0 | sed 's/\s-l\(pango\)\{0,1\}cairo\S*\s/ /g')
+				else
+					LIBS+= $(shell pkg-config --libs gtk+-2.0)
+				endif
 			endif
 		else
 			HAVE_GTK2=0
@@ -142,4 +144,7 @@ endif
 ifneq (0,$(NOASM))
   BUILDCFLAGS+= -DNOASM
 endif
+ifneq (0,$(LINKED_GTK))
+  BUILDCFLAGS+= -DLINKED_GTK
+endif
 
diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 689cf8766..9d50ec43d 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -8,6 +8,7 @@ SUPERBUILD = 1
 POLYMOST = 1
 USE_OPENGL = 1
 NOASM = 0
+LINKED_GTK = 0
 
 # Debugging options
 RELEASE?=1
diff --git a/polymer/eduke32/source/grpscan.c b/polymer/eduke32/source/grpscan.c
index 80d0bc1c7..2817b4a70 100755
--- a/polymer/eduke32/source/grpscan.c
+++ b/polymer/eduke32/source/grpscan.c
@@ -13,8 +13,8 @@ struct grpfile grpfiles[numgrpfiles] =
         { "Duke Nukem 3D",						    0xBBC9CE44, 26524524, GAMEDUKE, NULL },
         { "Duke Nukem 3D: Atomic Edition",		    0xF514A6AC, 44348015, GAMEDUKE, NULL },
         { "Duke Nukem 3D: Atomic Edition",		    0xFD3DCFF1, 44356548, GAMEDUKE, NULL },
-        { "Duke Nukem 3D Shareware Version",		0x983AD923, 11035779, GAMEDUKE, NULL },
-        { "Duke Nukem 3D Mac Shareware Version",	0xC5F71561, 10444391, GAMEDUKE, NULL },
+        { "Duke Nukem 3D Shareware",		        0x983AD923, 11035779, GAMEDUKE, NULL },
+        { "Duke Nukem 3D Mac Shareware",	        0xC5F71561, 10444391, GAMEDUKE, NULL },
         { "Duke Nukem 3D Mac",     				    0x00000000, 0,        GAMEDUKE, NULL },
         { "NAM",                        			0x75C1F07B, 43448927, GAMENAM,  NULL },
         { "Napalm",                        			0x3DE1589A, 44365728, GAMENAM,  NULL },