[Supertux-Commit] r5457 - in trunk/supertux-editor: . gtkgl-sharp

matzeb at millhouse.dreamhost.com matzeb at millhouse.dreamhost.com
Sat May 10 10:49:19 PDT 2008


Author: matzeb
Date: 2008-05-10 10:49:18 -0700 (Sat, 10 May 2008)
New Revision: 5457

Modified:
   trunk/supertux-editor/gtkgl-sharp.dll.config
   trunk/supertux-editor/gtkgl-sharp/X11GLContext.cs
   trunk/supertux-editor/libeditor.dll.config
Log:
adapted mono .config files for OS/X

Modified: trunk/supertux-editor/gtkgl-sharp/X11GLContext.cs
===================================================================
--- trunk/supertux-editor/gtkgl-sharp/X11GLContext.cs	2008-05-10 16:40:01 UTC (rev 5456)
+++ trunk/supertux-editor/gtkgl-sharp/X11GLContext.cs	2008-05-10 17:49:18 UTC (rev 5457)
@@ -41,7 +41,7 @@
 
 	internal sealed class X11GLContext : GLContext
 	{
-		private const string GL_DLL = "GL";
+		private const string GL_DLL = "opengl32.dll";
 
 		[DllImport(GL_DLL), SuppressUnmanagedCodeSecurityAttribute]
 		static extern bool glXMakeCurrent (IntPtr display,

Modified: trunk/supertux-editor/gtkgl-sharp.dll.config
===================================================================
--- trunk/supertux-editor/gtkgl-sharp.dll.config	2008-05-10 16:40:01 UTC (rev 5456)
+++ trunk/supertux-editor/gtkgl-sharp.dll.config	2008-05-10 17:49:18 UTC (rev 5457)
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<dllmap dll="GL" target="libGL.so.1"/>
-	<dllmap dll="gdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
-	<dllmap dll="X11" target="libX11.so.6"/>
+	<dllmap dll="opengl32.dll">
+		<dllentry os="!osx,windows" dll="libGL.so.1"/>
+		<dllentry os="osx" dll="/usr/X11/lib/libGL.dylib" />
+	</dllmap>
+	<dllmap dll="gdk-x11-2.0">
+		<dllentry os="!osx,windows" dll="libgdk-x11-2.0.so.0"/>
+		<dllentry os="osx" dll="libgdk-x11-2.0.dylib"/>
+	</dllmap>
+	<dllmap dll="X11">
+		<dllentry os="!osx,windows" dll="libX11.so.6"/>
+		<dllentry os="osx" dll="/usr/X11/lib/libX11.dylib"/>
+	</dllmap>
 </configuration>

Modified: trunk/supertux-editor/libeditor.dll.config
===================================================================
--- trunk/supertux-editor/libeditor.dll.config	2008-05-10 16:40:01 UTC (rev 5456)
+++ trunk/supertux-editor/libeditor.dll.config	2008-05-10 17:49:18 UTC (rev 5457)
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<dllmap dll="opengl32.dll" target="libGL.so.1"/>
-	<dllmap dll="sdl.dll" target="libSDL-1.2.so.0"/>
+	<dllmap dll="opengl32.dll">
+		<dllentry os="!osx,windows" dll="libGL.so.1"/>
+		<dllentry os="osx" dll="/usr/X11/lib/libGL.dylib" />
+	</dllmap>
+	<dllmap dll="sdl.dll">
+		<dllentry dll="!osx,windows" dll="libSDL-1.2.so.0">
+		<dllentry os="osx" dll="libSDL.dylib">
+	</dllmap>
 	<dllmap dll="sdl_image.dll" target="libSDL_image-1.2.so.0"/>
 </configuration>




More information about the Supertux-Commit mailing list