[SCM] Standalone 3D Game Maker and 3D Game Design program branch, master, updated. debian/2.6.1+dfsg-4-4-g74e93ad

[Scott Howard]

The following commit has been merged in the master branch:
commit 5e06062d05a3dd7be8d912f5a418aa39d89582a1
Author: Scott Howard <showard314 at gmail.com>
Date:   Sat Mar 19 10:30:07 2011 -0400

    refreshed patches

diff --git a/debian/patches/librt_linking.patch b/debian/patches/librt_linking.patch
index 24b01c3..40bce8b 100644
--- a/debian/patches/librt_linking.patch
+++ b/debian/patches/librt_linking.patch
@@ -3,14 +3,16 @@ Description: 'shm_open@@GLIBC_2.3' is defined in DSO //lib/librt.so.1 so try
 Author: Scott Howard <showard at debian.org>
 Bug-Debian: http://bugs.debian.org/618785
 
---- sandboxgamemaker-2.6.1+dfsg.orig/src/Makefile
-+++ sandboxgamemaker-2.6.1+dfsg/src/Makefile
-@@ -24,7 +24,7 @@ CLIENT_INCLUDES= $(INCLUDES) -Iinclude
- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
- else
- CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
-+CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11 -lrt
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
+Index: sandboxgamemaker/src/Makefile
+===================================================================
+--- sandboxgamemaker.orig/src/Makefile	2011-03-19 10:27:15.000000000 -0400
++++ sandboxgamemaker/src/Makefile	2011-03-19 10:28:53.076154639 -0400
+@@ -24,7 +24,7 @@
+ CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
+ else
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11 -lrt
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt
diff --git a/src/Makefile.rej b/src/Makefile.rej
new file mode 100644
index 0000000..83a9bc1
--- /dev/null
+++ b/src/Makefile.rej
@@ -0,0 +1,11 @@
+--- src/Makefile
++++ src/Makefile
+@@ -24,7 +24,7 @@
+ CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
+ else
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11 -lrt
+ endif
+ ifeq ($(PLATFORM),Linux)
+ CLIENT_LIBS+= -lrt

-- 
Standalone 3D Game Maker and 3D Game Design program