From 736082f2c07aec39311b8356e474f447c06abcd3 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 21 Jul 2011 14:21:57 +0000
Subject: Don't use $^ in Makefiles, as it s a GNU make extension (thanks Jakub
 Lach).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2354
---
 src/Makefile.am | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 24c6e2b2..40be7787 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -187,26 +187,26 @@ appdir = $(prefix)/share/applications
 app_DATA = @PROGRAM_PREFIX@doom.desktop
 
 @PROGRAM_PREFIX@doom.desktop : doom.desktop
-	cp $^ $@
+	cp $< $@
 
 screensaverdir = $(prefix)/share/applications/screensavers
 screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop
 
 @PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop
-	cp $^ $@
+	cp $< $@
 
 .rc.o:
-	$(WINDRES) $^ -o $@
+	$(WINDRES) $< -o $@
 %.o : %.rc
-	$(WINDRES) $^ -o $@
+	$(WINDRES) $< -o $@
 
 if HAVE_PYTHON
 
 icon.c : ../data/doom8.ico
-	../data/convert-icon $^ $@
+	../data/convert-icon $< $@
 
 endif
 
 midiread : midifile.c
-	$(CC) -DTEST $(CFLAGS) @LDFLAGS@ $^ -o $@
+	$(CC) -DTEST $(CFLAGS) @LDFLAGS@ $< -o $@
 
-- 
cgit v1.2.3


From aa621807015f56e451432fe1d9cdd05fcdeb92cf Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 20 Aug 2011 18:10:23 +0000
Subject: Fix gnome-screensaver .desktop file (thanks Rahul Sundaram).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2356
---
 src/doom-screensaver.desktop.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/doom-screensaver.desktop.in b/src/doom-screensaver.desktop.in
index 178575a2..315f964c 100644
--- a/src/doom-screensaver.desktop.in
+++ b/src/doom-screensaver.desktop.in
@@ -1,6 +1,5 @@
 
 [Desktop Entry]
-Encoding=UTF-8
 Name=@PACKAGE_NAME@
 Comment=@PACKAGE_SHORTDESC@
 TryExec=@PROGRAM_PREFIX@doom
@@ -8,5 +7,6 @@ Exec=@PROGRAM_PREFIX@doom
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Screensaver
+OnlyShowIn=GNOME;
+Categories=Screensaver;
 
-- 
cgit v1.2.3


From 358db83778b46427fe267f86532d3a84d25a50ac Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 29 Aug 2011 20:37:26 +0000
Subject: Fix bug with detection of IWAD type by filename (thanks mether).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2359
---
 src/d_iwad.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/d_iwad.c b/src/d_iwad.c
index c0d33707..be5a3880 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -430,22 +430,24 @@ static char *SearchDirectoryForIWAD(char *dir)
 static void IdentifyIWADByName(char *name)
 {
     size_t i;
+    char *p;
 
-    gamemission = none;
-    
-    for (i=0; i<arrlen(iwads); ++i)
-    {
-        char *iwadname;
+    // Trim down the name to just the filename, ignoring the path.
 
-        iwadname = DEH_String(iwads[i].name);
+    p = strrchr(name, DIR_SEPARATOR);
 
-        if (strlen(name) < strlen(iwadname))
-            continue;
+    if (p != NULL)
+    {
+        name = p + 1;
+    }
+
+    gamemission = none;
 
-        // Check if it ends in this IWAD name.
+    for (i=0; i<arrlen(iwads); ++i)
+    {
+        // Check if the filename is this IWAD name.
 
-        if (!strcasecmp(name + strlen(name) - strlen(iwadname), 
-                        iwadname))
+        if (!strcasecmp(name, DEH_String(iwads[i].name)))
         {
             CheckSpecialIWADs(iwads[i].name);
             gamemission = iwads[i].mission;
-- 
cgit v1.2.3


From df292a6dce27e7b20faa0c829aa0c58a3693f979 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 11 Sep 2011 17:01:56 +0000
Subject: Don't show error dialog if running from the console on OS X.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2364
---
 src/i_system.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/i_system.c b/src/i_system.c
index 15e91653..65ca8854 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -371,6 +371,7 @@ void I_Error (char *error, ...)
 #endif
 
 #ifdef __MACOSX__
+    if (!I_ConsoleStdout())
     {
         CFStringRef message;
         char msgbuf[512];
-- 
cgit v1.2.3