Author: dhudson
Date: 2006-01-19 11:11:55 -0500 (Thu, 19 Jan 2006)
New Revision: 55789
Added:
trunk/tao/src/Tao.PhysFs/Tao.PhysFs.dll.config.fedora
Modified:
trunk/tao/src/Tao.PhysFs/Fs.cs
trunk/tao/src/Tao.Sdl/Sdl.cs
trunk/tao/src/Tao.Sdl/SdlGfx.cs
trunk/tao/src/Tao.Sdl/SdlImage.cs
trunk/tao/src/Tao.Sdl/SdlMixer.cs
trunk/tao/src/Tao.Sdl/SdlNet.cs
trunk/tao/src/Tao.Sdl/SdlTtf.cs
trunk/tao/src/Tao.Sdl/Smpeg.cs
trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config
trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.fedora
trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.osx
trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.ubuntu
Log:
make lib names for p/invoke match the standard. Add fedora config file
Modified: trunk/tao/src/Tao.PhysFs/Fs.cs
===================================================================
--- trunk/tao/src/Tao.PhysFs/Fs.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.PhysFs/Fs.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -70,7 +70,7 @@
/// the ".config" file mechanism. Kudos to the Mono team for
this
/// simple yet elegant solution.
/// </remarks>
- private const string PHYSFS_NATIVE_LIBRARY = "PHYSFS";
+ private const string PHYSFS_NATIVE_LIBRARY = "physfs.dll";
#endregion string PHYSFS_NATIVE_LIBRARY
#region CallingConvention CALLING_CONVENTION
@@ -1608,4 +1608,4 @@
#endregion physfs.h
}
-}
\ No newline at end of file
+}
Added: trunk/tao/src/Tao.PhysFs/Tao.PhysFs.dll.config.fedora
===================================================================
--- trunk/tao/src/Tao.PhysFs/Tao.PhysFs.dll.config.fedora 2006-01-19
16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.PhysFs/Tao.PhysFs.dll.config.fedora 2006-01-19
16:11:55 UTC (rev 55789)
@@ -0,0 +1,3 @@
+<configuration>
+ <dllmap dll="physfs.dll" target="libphysfs-1.0.so.1" />
+</configuration>
Modified: trunk/tao/src/Tao.Sdl/Sdl.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/Sdl.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.Sdl/Sdl.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -59,7 +59,7 @@
/// <remarks>
/// Specifies SDL.dll everywhere; will be mapped via
.config for mono.
/// </remarks>
- private const string SDL_NATIVE_LIBRARY = "SDL";
+ private const string SDL_NATIVE_LIBRARY = "SDL.dll";
#endregion string SDL_NATIVE_LIBRARY
#region CallingConvention CALLING_CONVENTION
Modified: trunk/tao/src/Tao.Sdl/SdlGfx.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/SdlGfx.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.Sdl/SdlGfx.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -59,7 +59,7 @@
/// <remarks>
/// Specifies SDL_gfx.dll everywhere; will be mapped via
.config for mono.
/// </remarks>
- private const string SDL_GFX_NATIVE_LIBRARY = "SDL_gfx";
+ private const string SDL_GFX_NATIVE_LIBRARY = "SDL_gfx.dll";
#endregion string SDL_GFX_NATIVE_LIBRARY
#region CallingConvention CALLING_CONVENTION
Modified: trunk/tao/src/Tao.Sdl/SdlImage.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/SdlImage.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.Sdl/SdlImage.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -112,7 +112,7 @@
/// <remarks>
/// Specifies SDL_image.dll everywhere; will be mapped via
.config for mono.
/// </remarks>
- private const string SDL_IMAGE_NATIVE_LIBRARY = "SDL_image";
+ private const string SDL_IMAGE_NATIVE_LIBRARY = "SDL_image.dll";
#endregion string SDL_IMAGE_NATIVE_LIBRARY
Modified: trunk/tao/src/Tao.Sdl/SdlMixer.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/SdlMixer.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.Sdl/SdlMixer.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -107,7 +107,7 @@
/// <remarks>
/// Specifies SDL_mixer.dll everywhere; will be mapped via
.config for mono.
/// </remarks>
- private const string SDL_MIXER_NATIVE_LIBRARY = "SDL_mixer";
+ private const string SDL_MIXER_NATIVE_LIBRARY = "SDL_mixer.dll";
#endregion string SDL_MIXER_NATIVE_LIBRARY
#region CallingConvention CALLING_CONVENTION
Modified: trunk/tao/src/Tao.Sdl/SdlNet.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/SdlNet.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.Sdl/SdlNet.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -49,7 +49,7 @@
/// Specifies SDL_net.dll everywhere; will be mapped via
/// .config for mono.
/// </remarks>
- private const string SDL_NET_NATIVE_LIBRARY = "SDL_net";
+ private const string SDL_NET_NATIVE_LIBRARY = "SDL_net.dll";
#endregion string SDL_NET_NATIVE_LIBRARY
#region CallingConvention CALLING_CONVENTION
Modified: trunk/tao/src/Tao.Sdl/SdlTtf.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/SdlTtf.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.Sdl/SdlTtf.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -73,7 +73,7 @@
/// <remarks>
/// Specifies SDL_ttf.dll everywhere; will be mapped via
.config for mono.
/// </remarks>
- private const string SDL_TTF_NATIVE_LIBRARY = "SDL_ttf";
+ private const string SDL_TTF_NATIVE_LIBRARY = "SDL_ttf.dll";
#endregion string SDL_TTF_NATIVE_LIBRARY
#region CallingConvention CALLING_CONVENTION
Modified: trunk/tao/src/Tao.Sdl/Smpeg.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/Smpeg.cs 2006-01-19 16:03:19 UTC (rev 55788)
+++ trunk/tao/src/Tao.Sdl/Smpeg.cs 2006-01-19 16:11:55 UTC (rev 55789)
@@ -51,7 +51,7 @@
/// <remarks>
/// Specifies smpeg.dll everywhere; will be mapped via
.config for mono.
/// </remarks>
- private const string SMPEG_NATIVE_LIBRARY = "smpeg";
+ private const string SMPEG_NATIVE_LIBRARY = "smpeg.dll";
#endregion string SMPEG_NATIVE_LIBRARY
#region CallingConvention CALLING_CONVENTION
Modified: trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config
===================================================================
--- trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config 2006-01-19 16:03:19 UTC (rev
55788)
+++ trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config 2006-01-19 16:11:55 UTC (rev
55789)
@@ -1,9 +1,9 @@
<configuration>
- <dllmap dll="SDL" target="libSDL.so" />
- <dllmap dll="SDL_image" target="libSDL_image.so" />
- <dllmap dll="SDL_mixer" target="libSDL_mixer.so" />
- <dllmap dll="SDL_ttf" target="libSDL_ttf.so" />
- <dllmap dll="SDL_net" target="libSDL_net.so" />
- <dllmap dll="smpeg" target="libsmpeg.so" />
- <dllmap dll="SDL_gfx" target="libSDL_gfx.so" />
+ <dllmap dll="SDL.dll" target="libSDL.so" />
+ <dllmap dll="SDL_image.dll" target="libSDL_image.so" />
+ <dllmap dll="SDL_mixer.dll" target="libSDL_mixer.so" />
+ <dllmap dll="SDL_ttf.dll" target="libSDL_ttf.so" />
+ <dllmap dll="SDL_net.dll" target="libSDL_net.so" />
+ <dllmap dll="smpeg.dll" target="libsmpeg.so" />
+ <dllmap dll="SDL_gfx.dll" target="libSDL_gfx.so" />
</configuration>
Modified: trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.fedora
===================================================================
--- trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.fedora 2006-01-19 16:03:19 UTC
(rev 55788)
+++ trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.fedora 2006-01-19 16:11:55 UTC
(rev 55789)
@@ -1,9 +1,9 @@
<configuration>
- <dllmap dll="SDL" target="libSDL-1.2.so.0" />
- <dllmap dll="SDL_image" target="libSDL_image-1.2.so.0" />
- <dllmap dll="SDL_mixer" target="libSDL_mixer-1.2.so.0" />
- <dllmap dll="SDL_ttf" target="libSDL_ttf-2.0.so.0" />
- <dllmap dll="SDL_net" target="libSDL_net-1.2.so.0" />
- <dllmap dll="smpeg" target="libsmpeg-0.4.so.0" />
- <dllmap dll="SDL_gfx" target="libSDL_gfx.so.13" />
+ <dllmap dll="SDL.dll" target="libSDL-1.2.so.0" />
+ <dllmap dll="SDL_image.dll" target="libSDL_image-1.2.so.0" />
+ <dllmap dll="SDL_mixer.dll" target="libSDL_mixer-1.2.so.0" />
+ <dllmap dll="SDL_ttf.dll" target="libSDL_ttf-2.0.so.0" />
+ <dllmap dll="SDL_net.dll" target="libSDL_net-1.2.so.0" />
+ <dllmap dll="smpeg.dll" target="libsmpeg-0.4.so.0" />
+ <dllmap dll="SDL_gfx.dll" target="libSDL_gfx.so.13" />
</configuration>
Modified: trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.osx
===================================================================
--- trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.osx 2006-01-19 16:03:19 UTC
(rev 55788)
+++ trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.osx 2006-01-19 16:11:55 UTC
(rev 55789)
@@ -1,12 +1,10 @@
<configuration>
- <dllmap dll="SDL" target="/Library/Frameworks/SDL.framework/SDL" />
- <dllmap dll="SDL_mixer"
target="/Library/Frameworks/SDL_mixer.framework/SDL_mixer" />
- <dllmap dll="SDL_image"
target="/Library/Frameworks/SDL_image.framework/SDL_image" />
- <dllmap dll="SDL_ttf"
target="/Library/Frameworks/SDL_ttf.framework/SDL_ttf" />
- <dllmap dll="SDL_net"
target="/Library/Frameworks/SDL_net.framework/SDL_net" />
- <dllmap dll="smpeg" target="libsmpeg.dylib" />
- <dllmap dll="SDL_gfx" target="libSDL_gfx.dylib" />
+ <dllmap dll="SDL.dll" target="/Library/Frameworks/SDL.framework/SDL" />
+ <dllmap dll="SDL_mixer.dll"
target="/Library/Frameworks/SDL_mixer.framework/SDL_mixer" />
+ <dllmap dll="SDL_image.dll"
target="/Library/Frameworks/SDL_image.framework/SDL_image" />
+ <dllmap dll="SDL_ttf.dll"
target="/Library/Frameworks/SDL_ttf.framework/SDL_ttf" />
+ <dllmap dll="SDL_net.dll"
target="/Library/Frameworks/SDL_net.framework/SDL_net" />
+ <dllmap dll="smpeg.dll" target="libsmpeg.dylib" />
+ <dllmap dll="SDL_gfx.dll" target="libSDL_gfx.dylib" />
<dllmap dll="libCocoaSharpGlue.dylib"
target="/Library/Frameworks/Mono.framework/Libraries/libCocoaSharpGlue.dylib" />
- <dllmap dll="opengl32.dll"
target="/System/Library/Frameworks/OpenGL.framework/OpenGL" />
- <dllmap dll="glu32.dll"
target="/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib" />
</configuration>
Modified: trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.ubuntu
===================================================================
--- trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.ubuntu 2006-01-19 16:03:19 UTC
(rev 55788)
+++ trunk/tao/src/Tao.Sdl/Tao.Sdl.dll.config.ubuntu 2006-01-19 16:11:55 UTC
(rev 55789)
@@ -1,9 +1,9 @@
<configuration>
- <dllmap dll="SDL" target="libSDL-1.2.so.0" />
- <dllmap dll="SDL_image" target="libSDL_image-1.2.so.0" />
- <dllmap dll="SDL_mixer" target="libSDL_mixer-1.2.so.0" />
- <dllmap dll="SDL_ttf" target="libSDL_ttf-2.0.so.0" />
- <dllmap dll="SDL_net" target="libSDL_net-1.2.so.0" />
- <dllmap dll="smpeg" target="libsmpeg-0.4.so.0" />
- <dllmap dll="SDL_gfx" target="libSDL_gfx.so.0" />
+ <dllmap dll="SDL.dll" target="libSDL-1.2.so.0" />
+ <dllmap dll="SDL_image.dll" target="libSDL_image-1.2.so.0" />
+ <dllmap dll="SDL_mixer.dll" target="libSDL_mixer-1.2.so.0" />
+ <dllmap dll="SDL_ttf.dll" target="libSDL_ttf-2.0.so.0" />
+ <dllmap dll="SDL_net.dll" target="libSDL_net-1.2.so.0" />
+ <dllmap dll="smpeg.dll" target="libsmpeg-0.4.so.0" />
+ <dllmap dll="SDL_gfx.dll" target="libSDL_gfx.so.0" />
</configuration>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches