From 1b0bdfe7de6f59a66cc4e0f59be26438f6621105 Mon Sep 17 00:00:00 2001 From: Trass3r Date: Sun, 30 Jan 2011 18:09:15 +0000 Subject: [PATCH] changed to new dll naming scheme git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1784 4e206d99-4929-0410-ac5d-dfc041789085 --- bindings/d/import/dsfml/audio/listener.d | 4 ++-- bindings/d/import/dsfml/audio/music.d | 4 ++-- bindings/d/import/dsfml/audio/sound.d | 4 ++-- bindings/d/import/dsfml/audio/soundbufferrecorder.d | 4 ++-- bindings/d/import/dsfml/audio/soundstream.d | 4 ++-- bindings/d/import/dsfml/graphics/drawableimpl.d | 4 ++-- bindings/d/import/dsfml/graphics/font.d | 4 ++-- bindings/d/import/dsfml/graphics/shader.d | 4 ++-- bindings/d/import/dsfml/graphics/view.d | 4 ++-- bindings/d/import/dsfml/network/ftp.d | 10 +++++----- bindings/d/import/dsfml/network/http.d | 8 ++++---- bindings/d/import/dsfml/network/packet.d | 4 ++-- bindings/d/import/dsfml/network/tcpsocket.d | 4 ++-- bindings/d/import/dsfml/network/udpsocket.d | 4 ++-- bindings/d/import/dsfml/system/common.d | 8 ++++---- bindings/d/import/dsfml/window/context.d | 13 ++----------- 16 files changed, 39 insertions(+), 48 deletions(-) diff --git a/bindings/d/import/dsfml/audio/listener.d b/bindings/d/import/dsfml/audio/listener.d index cc973ddb0..408b4e7bd 100644 --- a/bindings/d/import/dsfml/audio/listener.d +++ b/bindings/d/import/dsfml/audio/listener.d @@ -171,9 +171,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-audio-d"); + DllLoader dll = DllLoader.load("csfml-audio-d-2"); else - DllLoader dll = DllLoader.load("csfml-audio"); + DllLoader dll = DllLoader.load("csfml-audio-2"); sfListener_SetGlobalVolume = cast(pf_sfListener_SetGlobalVolume)dll.getSymbol("sfListener_SetGlobalVolume"); sfListener_GetGlobalVolume = cast(pf_sfListener_GetGlobalVolume)dll.getSymbol("sfListener_GetGlobalVolume"); diff --git a/bindings/d/import/dsfml/audio/music.d b/bindings/d/import/dsfml/audio/music.d index 3f7d8a1af..39f64acfa 100644 --- a/bindings/d/import/dsfml/audio/music.d +++ b/bindings/d/import/dsfml/audio/music.d @@ -171,9 +171,9 @@ uint function(SFMLClass) sfMusic_GetSampleRate; static this() { debug - DllLoader dll = DllLoader.load("csfml-audio-d"); + DllLoader dll = DllLoader.load("csfml-audio-d-2"); else - DllLoader dll = DllLoader.load("csfml-audio"); + DllLoader dll = DllLoader.load("csfml-audio-2"); mixin(loadFromSharedLib("sfMusic_CreateFromFile")); mixin(loadFromSharedLib("sfMusic_CreateFromMemory")); diff --git a/bindings/d/import/dsfml/audio/sound.d b/bindings/d/import/dsfml/audio/sound.d index e4403512c..c13922add 100644 --- a/bindings/d/import/dsfml/audio/sound.d +++ b/bindings/d/import/dsfml/audio/sound.d @@ -207,9 +207,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-audio-d"); + DllLoader dll = DllLoader.load("csfml-audio-d-2"); else - DllLoader dll = DllLoader.load("csfml-audio"); + DllLoader dll = DllLoader.load("csfml-audio-2"); sfSound_Play = cast(pf_sfSound_Play)dll.getSymbol("sfSound_Play"); sfSound_Pause = cast(pf_sfSound_Pause)dll.getSymbol("sfSound_Pause"); diff --git a/bindings/d/import/dsfml/audio/soundbufferrecorder.d b/bindings/d/import/dsfml/audio/soundbufferrecorder.d index 43c9d70e8..caf1fc503 100644 --- a/bindings/d/import/dsfml/audio/soundbufferrecorder.d +++ b/bindings/d/import/dsfml/audio/soundbufferrecorder.d @@ -97,9 +97,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-audio-d"); + DllLoader dll = DllLoader.load("csfml-audio-d-2"); else - DllLoader dll = DllLoader.load("csfml-audio"); + DllLoader dll = DllLoader.load("csfml-audio-2"); sfSoundBufferRecorder_Create = cast(pf_sfSoundBufferRecorder_Create)dll.getSymbol("sfSoundBufferRecorder_Create"); sfSoundBufferRecorder_Destroy = cast(pf_sfSoundBufferRecorder_Destroy)dll.getSymbol("sfSoundBufferRecorder_Destroy"); diff --git a/bindings/d/import/dsfml/audio/soundstream.d b/bindings/d/import/dsfml/audio/soundstream.d index d7bce0b4e..8fb4d060b 100644 --- a/bindings/d/import/dsfml/audio/soundstream.d +++ b/bindings/d/import/dsfml/audio/soundstream.d @@ -365,9 +365,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-audio-d"); + DllLoader dll = DllLoader.load("csfml-audio-d-2"); else - DllLoader dll = DllLoader.load("csfml-audio"); + DllLoader dll = DllLoader.load("csfml-audio-2"); sfSoundStream_Create = cast(pf_sfSoundStream_Create)dll.getSymbol("sfSoundStream_Create"); sfSoundStream_Destroy = cast(pf_sfSoundStream_Destroy)dll.getSymbol("sfSoundStream_Destroy"); diff --git a/bindings/d/import/dsfml/graphics/drawableimpl.d b/bindings/d/import/dsfml/graphics/drawableimpl.d index ee2ef5c3a..916876e99 100644 --- a/bindings/d/import/dsfml/graphics/drawableimpl.d +++ b/bindings/d/import/dsfml/graphics/drawableimpl.d @@ -256,9 +256,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-graphics-d"); + DllLoader dll = DllLoader.load("csfml-graphics-d-2"); else - DllLoader dll = DllLoader.load("csfml-graphics"); + DllLoader dll = DllLoader.load("csfml-graphics-2"); sfRenderWindow_DrawThis = cast(pf_sfRenderWindow_DrawThis)dll.getSymbol("sfRenderWindow_Draw" ~ derivedClassName[2..$]); sfRenderWindow_DrawThisWithShader = cast(pf_sfRenderWindow_DrawThisWithShader)dll.getSymbol("sfRenderWindow_Draw" ~ derivedClassName[2..$] ~ "WithShader"); diff --git a/bindings/d/import/dsfml/graphics/font.d b/bindings/d/import/dsfml/graphics/font.d index bd8146ca1..0cbfa045f 100644 --- a/bindings/d/import/dsfml/graphics/font.d +++ b/bindings/d/import/dsfml/graphics/font.d @@ -173,9 +173,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-graphics-d"); + DllLoader dll = DllLoader.load("csfml-graphics-d-2"); else - DllLoader dll = DllLoader.load("csfml-graphics"); + DllLoader dll = DllLoader.load("csfml-graphics-2"); // sfFont mixin(loadFromSharedLib("sfFont_CreateFromFile")); diff --git a/bindings/d/import/dsfml/graphics/shader.d b/bindings/d/import/dsfml/graphics/shader.d index cf5780b97..ea7e07b71 100644 --- a/bindings/d/import/dsfml/graphics/shader.d +++ b/bindings/d/import/dsfml/graphics/shader.d @@ -158,9 +158,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-graphics-d"); + DllLoader dll = DllLoader.load("csfml-graphics-d-2"); else - DllLoader dll = DllLoader.load("csfml-graphics"); + DllLoader dll = DllLoader.load("csfml-graphics-2"); mixin(loadFromSharedLib("sfShader_CreateFromFile")); mixin(loadFromSharedLib("sfShader_CreateFromMemory")); diff --git a/bindings/d/import/dsfml/graphics/view.d b/bindings/d/import/dsfml/graphics/view.d index e02f1dbd8..c1357bb87 100644 --- a/bindings/d/import/dsfml/graphics/view.d +++ b/bindings/d/import/dsfml/graphics/view.d @@ -320,9 +320,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-graphics-d"); + DllLoader dll = DllLoader.load("csfml-graphics-d-2"); else - DllLoader dll = DllLoader.load("csfml-graphics"); + DllLoader dll = DllLoader.load("csfml-graphics-2"); mixin(loadFromSharedLib("sfView_Create")); mixin(loadFromSharedLib("sfView_CreateFromRect")); diff --git a/bindings/d/import/dsfml/network/ftp.d b/bindings/d/import/dsfml/network/ftp.d index 6aa439007..7fbc36cdb 100644 --- a/bindings/d/import/dsfml/network/ftp.d +++ b/bindings/d/import/dsfml/network/ftp.d @@ -182,7 +182,7 @@ class Ftp : DSFMLObject } static this() { - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfFtpResponse_Destroy = cast(pf_sfFtpResponse_Destroy)dll.getSymbol("sfFtpResponse_Destroy"); sfFtpResponse_IsOk = cast(pf_sfFtpResponse_IsOk)dll.getSymbol("sfFtpResponse_IsOk"); @@ -229,7 +229,7 @@ class Ftp : DSFMLObject } static this() { - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfFtpDirectoryResponse_Destroy = cast(pf_sfFtpDirectoryResponse_Destroy)dll.getSymbol("sfFtpDirectoryResponse_Destroy"); sfFtpDirectoryResponse_GetDirectory = cast(pf_sfFtpDirectoryResponse_GetDirectory)dll.getSymbol("sfFtpDirectoryResponse_GetDirectory"); @@ -309,7 +309,7 @@ class Ftp : DSFMLObject } static this() { - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfFtpListingResponse_Destroy = cast(pf_sfFtpListingResponse_Destroy)dll.getSymbol("sfFtpListingResponse_Destroy"); sfFtpListingResponse_GetCount = cast(pf_sfFtpListingResponse_GetCount)dll.getSymbol("sfFtpListingResponse_GetCount"); @@ -577,9 +577,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-network-d"); + DllLoader dll = DllLoader.load("csfml-network-d-2"); else - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfFtp_Create = cast(pf_sfFtp_Create)dll.getSymbol("sfFtp_Create"); sfFtp_Destroy = cast(pf_sfFtp_Destroy)dll.getSymbol("sfFtp_Destroy"); diff --git a/bindings/d/import/dsfml/network/http.d b/bindings/d/import/dsfml/network/http.d index 82b8b14de..1ab943029 100644 --- a/bindings/d/import/dsfml/network/http.d +++ b/bindings/d/import/dsfml/network/http.d @@ -178,7 +178,7 @@ class Http : DSFMLObject static this() { - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfHttpResponse_Destroy = cast(pf_sfHttpResponse_Destroy)dll.getSymbol("sfHttpResponse_Destroy"); sfHttpResponse_GetField = cast(pf_sfHttpResponse_GetField)dll.getSymbol("sfHttpResponse_GetField"); @@ -295,7 +295,7 @@ class Http : DSFMLObject static this() { - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfHttpRequest_Create = cast(pf_sfHttpRequest_Create)dll.getSymbol("sfHttpRequest_Create"); sfHttpRequest_Destroy = cast(pf_sfHttpRequest_Destroy)dll.getSymbol("sfHttpRequest_Destroy"); @@ -386,9 +386,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-network-d"); + DllLoader dll = DllLoader.load("csfml-network-d-2"); else - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfHttp_Create = cast(pf_sfHttp_Create)dll.getSymbol("sfHttp_Create"); sfHttp_Destroy = cast(pf_sfHttp_Destroy)dll.getSymbol("sfHttp_Destroy"); diff --git a/bindings/d/import/dsfml/network/packet.d b/bindings/d/import/dsfml/network/packet.d index f443729b1..9a09646a3 100644 --- a/bindings/d/import/dsfml/network/packet.d +++ b/bindings/d/import/dsfml/network/packet.d @@ -381,9 +381,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-network-d"); + DllLoader dll = DllLoader.load("csfml-network-d-2"); else - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfPacket_Append = cast(pf_sfPacket_Append)dll.getSymbol("sfPacket_Append"); sfPacket_CanRead = cast(pf_sfPacket_CanRead)dll.getSymbol("sfPacket_CanRead"); diff --git a/bindings/d/import/dsfml/network/tcpsocket.d b/bindings/d/import/dsfml/network/tcpsocket.d index 690a45c39..71637444d 100644 --- a/bindings/d/import/dsfml/network/tcpsocket.d +++ b/bindings/d/import/dsfml/network/tcpsocket.d @@ -255,9 +255,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-network-d"); + DllLoader dll = DllLoader.load("csfml-network-d-2"); else - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfTcpSocket_Accept = cast(pf_sfTcpSocket_Accept)dll.getSymbol("sfTcpSocket_Accept"); sfTcpSocket_Connect = cast(pf_sfTcpSocket_Connect)dll.getSymbol("sfTcpSocket_Connect"); diff --git a/bindings/d/import/dsfml/network/udpsocket.d b/bindings/d/import/dsfml/network/udpsocket.d index d5516156b..2778df18f 100644 --- a/bindings/d/import/dsfml/network/udpsocket.d +++ b/bindings/d/import/dsfml/network/udpsocket.d @@ -224,9 +224,9 @@ private: static this() { debug - DllLoader dll = DllLoader.load("csfml-network-d"); + DllLoader dll = DllLoader.load("csfml-network-d-2"); else - DllLoader dll = DllLoader.load("csfml-network"); + DllLoader dll = DllLoader.load("csfml-network-2"); sfUdpSocket_Bind = cast(pf_sfUdpSocket_Bind)dll.getSymbol("sfUdpSocket_Bind"); sfUdpSocket_Create = cast(pf_sfUdpSocket_Create)dll.getSymbol("sfUdpSocket_Create"); diff --git a/bindings/d/import/dsfml/system/common.d b/bindings/d/import/dsfml/system/common.d index 5dff21f88..59f04f20e 100644 --- a/bindings/d/import/dsfml/system/common.d +++ b/bindings/d/import/dsfml/system/common.d @@ -56,9 +56,9 @@ string loadFromSharedLib2(S...)(string lib, string className, S fnames) string res = `static this() { debug - DllLoader dll = DllLoader.load("` ~ lib ~ `-d"); + DllLoader dll = DllLoader.load("` ~ lib ~ `-d-2"); else - DllLoader dll = DllLoader.load("` ~ lib ~ `"); + DllLoader dll = DllLoader.load("` ~ lib ~ `-2"); `; @@ -74,9 +74,9 @@ string loadDerivedFromSharedLib(S...)(string lib, string baseClass, string deriv string res = `static this() { debug - DllLoader dll = DllLoader.load("` ~ lib ~ `-d"); + DllLoader dll = DllLoader.load("` ~ lib ~ `-d-2"); else - DllLoader dll = DllLoader.load("` ~ lib ~ `"); + DllLoader dll = DllLoader.load("` ~ lib ~ `-2"); `; diff --git a/bindings/d/import/dsfml/window/context.d b/bindings/d/import/dsfml/window/context.d index 8d36dd38f..40c09dde2 100644 --- a/bindings/d/import/dsfml/window/context.d +++ b/bindings/d/import/dsfml/window/context.d @@ -63,15 +63,6 @@ private: void function(SFMLClass, bool) sfContext_SetActive; } - static this() - { - debug - DllLoader dll = DllLoader.load("csfml-window-d"); - else - DllLoader dll = DllLoader.load("csfml-window"); - - mixin(loadFromSharedLib("sfContext_Create")); - mixin(loadFromSharedLib("sfContext_Destroy")); - mixin(loadFromSharedLib("sfContext_SetActive")); - } + mixin(loadFromSharedLib2("csfml-window", "sfContext", + "Create", "Destroy", "SetActive")); } \ No newline at end of file