lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ added OSX support with a patch from egladil

Browse source 
* fixed pong example to use stdlib instead of csfml-system

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1439 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
trass3r 2010-03-04 02:21:18 +00:00
parent d60a7be49a
commit 8390807b08
4 changed files with 74 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

43
DSFML/import/dsfml/system/dllloader.d
View file

@ -43,7 +43,7 @@ else
import std.windows.syserror; // for error strings
alias HMODULE MODULEHANDLE;
}
version (linux)
else version (linux)
{
import std.c.linux.linux;
alias void* MODULEHANDLE;
@ -51,6 +51,21 @@ else
const int RTLD_NOW = 0x00002;
const int RTLD_GLOBAL = 0x00100;
}
else version (darwin)
{
alias void* MODULEHANDLE;
const int RTLD_NOW = 0x2;
const int RTLD_GLOBAL = 0x8;
extern (C)
{
void* dlopen(char* file, int mode);
int dlclose(void* handle);
void* dlsym(void* handle, char* name);
char* dlerror();
}
}
}
static this()
@ -91,10 +106,14 @@ class DllLoader
{
string libraryName = library ~ ".dll";
}
version (linux)
else version (linux)
{
string libraryName = "lib" ~ library ~ ".so";
}
else version (darwin)
{
string libraryName = "lib" ~ library ~ ".dylib";
}
if (libraryName in alreadyLoaded)
{
@ -121,7 +140,11 @@ class DllLoader
{
symb = GetProcAddress(m_lib, toStringz(symbolName));
}
version (linux)
else version (linux)
{
symb = dlsym(m_lib, toStringz(symbolName));
}
else version (darwin)
{
symb = dlsym(m_lib, toStringz(symbolName));
}
@ -145,7 +168,11 @@ class DllLoader
{
FreeLibrary(m_lib);
}
version (linux)
else version (linux)
{
dlclose(m_lib);
}
else version (darwin)
{
dlclose(m_lib);
}
@ -176,10 +203,16 @@ private:
{
m_lib = LoadLibraryA(toStringz(libraryPath));
}
version (linux)
else version (linux)
{
m_lib = dlopen(toStringz(libraryPath), RTLD_NOW | RTLD_GLOBAL);
}
else version (darwin)
{
m_lib = dlopen(toStringz(libraryPath), RTLD_NOW | RTLD_GLOBAL);
if (m_lib is null)
m_lib = dlopen(toStringz("@executable_path/" ~ libraryPath), RTLD_NOW | RTLD_GLOBAL);
}
}
if (m_lib is null)
{