mirror of
https://github.com/SFML/SFML.git
synced 2024-11-28 22:31:09 +08:00
changed to new dll naming scheme
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1784 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
f7427fe167
commit
1b0bdfe7de
@ -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");
|
||||
|
@ -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"));
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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"));
|
||||
|
@ -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"));
|
||||
|
@ -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"));
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
||||
`;
|
||||
|
||||
|
@ -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"));
|
||||
}
|
Loading…
Reference in New Issue
Block a user