Changeset 91

Show
Ignore:
Timestamp:
02/26/05 11:49:30 (4 years ago)
Author:
aldacron
Message:

* added the DerelictUtil? package
* converted all existing packages to use derelict.util.loader rather than std.loader - this required source and makefile modifications for each package

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictAL/Makefile

    r74 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n 
    8 DINC = -I$(SRC.DIR) 
     8DINC = -I$(SRC.DIR) -I..\DerelictUtil 
    99 
    1010OAL.SRC.DIR = $(SRC.DIR)\derelict\openal 

  • trunk/DerelictAL/derelict/openal/al.d

    r90 r91  
    144144// Loader 
    145145//============================================================================== 
    146 private import std.loader; 
    147  
    148 private HXModule hal; 
    149 private bit exeModuleInited = false; 
    150  
    151 private void* getProc(char[] procname) 
    152 { 
    153     void *symbol = ExeModule_GetSymbol(hal, procname); 
    154     if(symbol is null) 
    155         throw new Exception("Failed to load openal proc address " ~ procname); 
    156     return symbol; 
     146private import derelict.util.loader; 
     147 
     148private SharedLib libAL; 
     149 
     150private void* getProc(char[] procName) 
     151{ 
     152    return Derelict_GetProc(libAL, procName); 
    157153} 
    158154 
    …… 
    225221public void DerelictAL_Load(char[] libName) 
    226222{ 
    227     if(hal !== null) 
     223    if(libAL !== null) 
    228224        return; 
    229225 
    230     if(ExeModule_Init() == -1) 
    231         throw new Exception("Exemodule initialization failed"); 
    232  
    233     exeModuleInited = true; 
    234  
    235     hal = ExeModule_Load(libName); 
    236  
    237     if(hal is null) 
    238         throw new Exception("Failed to load the OpenAL shared library."); 
    239  
     226    libAL = Derelict_LoadSharedLib(libName); 
    240227    loadAL(); 
    241228} 
    …… 
    245232        version(Windows) 
    246233            DerelictAL_Load("OpenAL32.dll"); 
     234        version(linux) 
     235            DerelictAL_Load("libal.so"); 
    247236} 
    248237 
    249238public void DerelictAL_Unload() 
    250239{ 
    251     if(hal !== null) 
    252         ExeModule_Release(hal); 
    253     if(exeModuleInited) 
    254     { 
    255         ExeModule_Uinit(); 
    256         exeModuleInited = false; 
    257     } 
     240    Derelict_UnloadSharedLib(libAL); 
    258241} 
    259242 

  • trunk/DerelictGL/Makefile

    r82 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n       
    8 DINC = -I$(SRC.DIR) 
     8DINC = -I$(SRC.DIR) -I..\DerelictUtil 
    99 
    1010OGL.SRC.DIR = $(SRC.DIR)\derelict\opengl 

  • trunk/DerelictGL/derelict/opengl/gl.d

    r90 r91  
    5858public void DerelictGL_Unload() 
    5959{ 
    60     internalCleanup(); 
     60    internalUnload(); 
    6161} 
    6262 

  • trunk/DerelictGL/derelict/opengl/internal.d

    r90 r91  
    11module derelict.opengl.internal; 
    22 
    3 private import std.loader; 
     3private import derelict.util.loader; 
    44 
    5 private HXModule hlib; 
    6 private bit exeModuleInited = false; 
     5private SharedLib libGL; 
    76 
    8 package void* getProc(char[] procname) 
     7package void* getProc(char[] procName) 
    98{ 
    10     void *symbol = ExeModule_GetSymbol(hlib, procname); 
    11     if(symbol is null) 
    12         throw new Exception("Failed to load shared library proc address " ~ procname); 
    13     return symbol; 
     9    return Derelict_GetProc(libGL, procName); 
    1410} 
    1511 
    1612package void internalLoad(char[] libName) 
    1713{ 
    18     if(hlib !== null) 
     14    if(libGL !== null) 
    1915        return; 
    2016 
    21     if(ExeModule_Init() == -1) 
    22         throw new Exception("ExeModule initialization failed"); 
    23  
    24     exeModuleInited = true; 
    25  
    26     hlib = ExeModule_Load(libName); 
    27  
    28     if(hlib is null) 
    29         throw new Exception("Failed to load the shared library " ~ libName); 
    30  
     17    libGL = Derelict_LoadSharedLib(libName); 
    3118} 
    3219 
    33 package void internalCleanup() 
     20package void internalUnload() 
    3421{ 
    35     if(hlib !== null) 
    36         ExeModule_Release(hlib); 
    37     if(exeModuleInited) 
    38     { 
    39         ExeModule_Uninit(); 
    40         exeModuleInited = false; 
    41     } 
     22    Derelict_UnloadSharedLib(libGL); 
    4223} 

  • trunk/DerelictGLFW/Makefile

    r74 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n       
    8 DINC = -I$(SRC.DIR) 
     8DINC = -I$(SRC.DIR) -I..\DerelictUtil 
    99 
    1010GLFW.SRC.DIR = $(SRC.DIR)\derelict\glfw 

  • trunk/DerelictGLFW/derelict/glfw/glfw.d

    r90 r91  
    4242module derelict.glfw.glfw; 
    4343 
    44 private import std.loader; 
    45  
    46 private HXModule hglfw; 
    47  
    48 private void* getProc(char[] procname) 
    49 { 
    50     void* symbol = ExeModule_GetSymbol(hglfw, procname); 
    51     if (symbol is null) 
    52         throw new Exception("Failed to load glfw proc address " ~ procname); 
    53     return symbol; 
    54 } 
    55  
    56 private bit exeModuleInited = false; 
     44private import derelict.util.loader; 
     45 
     46private SharedLib libGLFW; 
     47 
     48private void* getProc(char[] procName) 
     49{ 
     50    return Derelict_GetProc(libGLFW, procName); 
     51} 
    5752 
    5853public void DerelictGLFW_Load(char[] libName) 
    5954{ 
    60     if(hglfw !== null) 
     55    if(libGLFW !== null) 
    6156        return; 
    6257 
    63     // there's no guarantee this will be used in together with DerelictGL, 
    64     // could be used with another OpenGL binding, so initialize std.loader 
    65     // (even though it doesn't do anything). 
    66     if(ExeModule_Init() == -1) 
    67         throw new Exception("ExeModule initialization failed"); 
    68  
    69     exeModuleInited = true; 
    70  
    71     hglfw = ExeModule_Load(libName); 
    72  
    73     if(hglfw is null) 
    74         throw new Exception("Failed to load the GLFW shared library."); 
    75  
     58    libGLFW = Derelict_LoadSharedLib(libName); 
    7659    load(); 
    7760} 
    …… 
    8770public void DerelictGLFW_Unload() 
    8871{ 
    89     if(hglfw) 
    90         ExeModule_Release(hglfw); 
    91     if(exeModuleInited) 
    92     { 
    93         ExeModule_Uninit(); 
    94         exeModuleInited = false; 
    95     } 
     72    Derelict_UnloadSharedLib(libGLFW); 
    9673} 
    9774 

  • trunk/DerelictSDL/Makefile

    r66 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n       
    8 DINC = -I$(SRC.DIR) 
     8DINC = -I$(SRC.DIR) -I..\DerelictUtil 
    99 
    1010SDL.SRC.DIR = $(SRC.DIR)\derelict\sdl 

  • trunk/DerelictSDL/Makefile.linux

    r69 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -r       
    8 DINC = -I$(SRC.DIR) 
     8DINC = -I$(SRC.DIR) -I../DerelictUtil 
    99 
    1010SDL.SRC.DIR = $(SRC.DIR)/derelict/sdl 

  • trunk/DerelictSDL/derelict/sdl/sdl.d

    r90 r91  
    2323*/ 
    2424 
    25 private import std.loader; 
     25private import derelict.util.loader; 
    2626 
    2727import derelict.sdl.active; 
    …… 
    8181// Loader 
    8282//============================================================================== 
    83 private HXModule hsdl; 
    84 private bit exeModuleInited = false; 
    85  
    86 private void* getProc(char[] procname) 
    87 { 
    88     void *symbol = ExeModule_GetSymbol(hsdl, procname); 
    89     if(symbol is null) 
    90         throw new Exception("Failed to load SDL proc address " ~ procname); 
    91     return symbol; 
     83private SharedLib libSDL; 
     84 
     85private void* getProc(char[] procName) 
     86{ 
     87    return Derelict_GetProc(libSDL, procName); 
    9288} 
    9389 
    …… 
    307303public void DerelictSDL_Load(char[] libName) 
    308304{ 
    309     if(hsdl !== null) 
     305    if(libSDL !== null) 
    310306        return; 
    311307 
    312     if(ExeModule_Init() == -1) 
    313         throw new Exception("ExeModule initialization failed"); 
    314  
    315     exeModuleInited = true; 
    316  
    317     hsdl = ExeModule_Load(libName); 
    318  
    319     if(hsdl is null) 
    320         throw new Exception("Failed to load the SDL shared library"); 
    321  
     308    libSDL = Derelict_LoadSharedLib(libName); 
    322309    load(); 
    323310} 
    …… 
    333320public void DerelictSDL_Unload() 
    334321{ 
    335     if(hsdl !== null) 
    336         ExeModule_Release(hsdl); 
    337     if(exeModuleInited) 
    338     { 
    339         ExeModule_Uninit(); 
    340         exeModuleInited = false; 
    341     } 
     322    Derelict_UnloadSharedLib(libSDL); 
    342323} 
    343324 

  • trunk/DerelictSDLImage/Makefile

    r66 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n       
    8 DINC = -I$(SRC.DIR), -I..\DerelictSDL 
     8DINC = -I$(SRC.DIR) -I..\DerelictSDL -I..\DerelictUtil 
    99     
    1010SDLIMG.SRC.DIR = $(SRC.DIR)\derelict\sdl 

  • trunk/DerelictSDLImage/Makefile.linux

    r66 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -r      
    8 DINC = -I$(SRC.DIR), -I../DerelictSDL 
     8DINC = -I$(SRC.DIR), -I../DerelictSDL, -I../DerelictUtil 
    99     
    1010SDLIMG.SRC.DIR = $(SRC.DIR)/derelict/sdl 

  • trunk/DerelictSDLImage/derelict/sdl/image.d

    r90 r91  
    2424 
    2525 
    26 private import derelict.sdl.sdl; 
    27 private import std.loader; 
     26private 
     27{ 
     28    import derelict.sdl.sdl; 
     29    import derelict.util.loader; 
     30} 
    2831 
    2932//============================================================================== 
    …… 
    8184// Loader 
    8285//============================================================================== 
    83 private HXModule hsdlImg; 
     86private SharedLib libSDLImage; 
    8487 
    8588 
    86 private void* getProc(char[] procname) 
     89private void* getProc(char[] procName) 
    8790{ 
    88     void *symbol = ExeModule_GetSymbol(hsdlImg, procname); 
    89     if(symbol is null) 
    90         throw new Exception("Failed to load SDLImage proc address " ~ procname); 
    91     return symbol; 
     91    return Derelict_GetProc(libSDLImage, procName); 
    9292} 
    9393 
    …… 
    123123public void DerelictSDLImage_Load(char[] libName) 
    124124{ 
    125     if(hsdlImg !== null) 
     125    if(libSDLImage !== null) 
    126126        return; 
    127127 
    128     hsdlImg = ExeModule_Load(libName); 
    129  
    130     if(!hsdlImg) 
    131         throw new Exception("Failed to load the SDL_image shared library."); 
    132  
     128    libSDLImage = Derelict_LoadSharedLib(libName); 
    133129    load(); 
    134130} 
    …… 
    144140public void DerelictSDLImage_Unload() 
    145141{ 
    146     if(hsdlImg !== null) 
    147         ExeModule_Release(hsdlImg); 
     142    Derelict_UnloadSharedLib(libSDLImage); 
    148143} 
    149144 

  • trunk/DerelictSDLMixer/Makefile

    r70 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n       
    8 DINC = -I$(SRC.DIR), -I..\DerelictSDL 
     8DINC = -I$(SRC.DIR) -I..\DerelictSDL -I..\DerelictUtil 
    99     
    1010SDLMIX.SRC.DIR = $(SRC.DIR)\derelict\sdl 

  • trunk/DerelictSDLMixer/Makefile.linux

    r70 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -r      
    8 DINC = -I$(SRC.DIR), -I../DerelictSDL 
     8DINC = -I$(SRC.DIR) -I../DerelictSDL -I../DerelictUtil 
    99     
    1010SDLMIX.SRC.DIR = $(SRC.DIR)/derelict/sdl 

  • trunk/DerelictSDLMixer/derelict/sdl/mixer.d

    r90 r91  
    2323*/ 
    2424 
    25 private import derelict.sdl.types; 
    26 private import derelict.sdl.rwops; 
    27 private import derelict.sdl.audio; 
    28 private import derelict.sdl.byteorder; 
    29 private import derelict.sdl.sdlversion; 
    30 private import derelict.sdl.error; 
    31 private import std.loader; 
     25private 
     26{ 
     27    import derelict.sdl.types; 
     28    import derelict.sdl.rwops; 
     29    import derelict.sdl.audio; 
     30    import derelict.sdl.byteorder; 
     31    import derelict.sdl.sdlversion; 
     32    import derelict.sdl.error; 
     33    import derelict.util.loader; 
     34} 
    3235 
    3336//============================================================================== 
    …… 
    247250// Loader 
    248251//============================================================================== 
    249 private HXModule hsdlMixer; 
    250  
    251  
    252 private void* getProc(char[] procname) 
    253 { 
    254     void *symbol = ExeModule_GetSymbol(hsdlMixer, procname); 
    255     if (symbol is null) 
    256         throw new Exception("Failed to load SDLMixer proc address " ~ procname); 
    257     return symbol; 
     252private SharedLib libSDLMixer; 
     253 
     254 
     255private void* getProc(char[] procName) 
     256{ 
     257    return Derelict_GetProc(libSDLMixer, procName); 
    258258} 
    259259 
    …… 
    325325public void DerelictSDLMixer_Load(char[] libName) 
    326326{ 
    327     if (hsdlMixer !== null) 
     327    if (libSDLMixer !== null) 
    328328        return; 
    329329 
    330     hsdlMixer = ExeModule_Load(libName); 
    331  
    332     if(hsdlMixer is null) 
    333         throw new Exception("Failed to load the SDL_mixer shared library."); 
    334  
     330    libSDLMixer = Derelict_LoadSharedLib(libName); 
    335331    load(); 
    336332} 
    …… 
    346342public void DerelictSDLMixer_Unload() 
    347343{ 
    348     if(hsdlMixer !== null) 
    349         ExeModule_Release(hsdlMixer); 
     344    Derelict_UnloadSharedLib(libSDLMixer); 
    350345} 
    351346 

  • trunk/DerelictSDLNet/Makefile

    r72 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n       
    8 DINC = -I$(SRC.DIR), -I..\DerelictSDL 
     8DINC = -I$(SRC.DIR) -I..\DerelictSDL -I..\DerelictUtil 
    99     
    1010SDLNET.SRC.DIR = $(SRC.DIR)\derelict\sdl 

  • trunk/DerelictSDLNet/Makefile.linux

    r72 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -r      
    8 DINC = -I$(SRC.DIR), -I../DerelictSDL 
     8DINC = -I$(SRC.DIR) -I../DerelictSDL -I..\DerelictUtil 
    99     
    1010SDLNET.SRC.DIR = $(SRC.DIR)/derelict/sdl 

  • trunk/DerelictSDLNet/derelict/sdl/net.d

    r90 r91  
    2323*/ 
    2424 
    25 private import derelict.sdl.sdl; 
    26 private import std.loader; 
     25private 
     26{ 
     27    import derelict.sdl.sdl; 
     28    import derelict.util.loader; 
     29} 
    2730 
    2831//============================================================================== 
    …… 
    209212// LOADER 
    210213//============================================================================== 
    211 private HXModule hsdlNet; 
    212  
    213 private void* getProc(char[] procname) 
    214 { 
    215     void *symbol = ExeModule_GetSymbol(hsdlNet, procname); 
    216     if(symbol is null) 
    217         throw new Exception("Failed to load SDLNet proc address " ~ procname); 
    218     return symbol; 
     214private SharedLib libSDLNet; 
     215 
     216private void* getProc(char[] procName) 
     217{ 
     218    return Derelict_GetProc(libSDLNet, procName); 
    219219} 
    220220 
    …… 
    254254public void DerelictSDLNet_Load(char[] libName) 
    255255{ 
    256     if(hsdlNet !== null) 
     256    if(libSDLNet !== null) 
    257257        return; 
    258258 
    259     hsdlNet = ExeModule_Load(libName); 
    260  
    261     if(hsdlNet is null) 
    262         throw new Exception("Failed to load the SDL_net shared library."); 
    263  
     259    libSDLNet = Derelict_LoadSharedLib(libName); 
    264260    load(); 
    265261} 
    …… 
    275271public void DerelictSDLNet_Unload() 
    276272{ 
    277     if(hsdlNet !== null) 
    278         ExeModule_Release(hsdlNet); 
     273    Derelict_UnloadSharedLib(libSDLNet); 
    279274} 
    280275 

  • trunk/DerelictSDLttf/Makefile

    r68 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -c -n       
    8 DINC = -I$(SRC.DIR), -I..\DerelictSDL 
     8DINC = -I$(SRC.DIR) -I..\DerelictSDL -I..\DerelictUtil 
    99     
    1010SDLTTF.SRC.DIR = $(SRC.DIR)\derelict\sdl 

  • trunk/DerelictSDLttf/Makefile.linux

    r68 r91  
    66DFLAGS = -v 
    77LIBFLAGS = -r      
    8 DINC = -I$(SRC.DIR), -I../DerelictSDL 
     8DINC = -I$(SRC.DIR), -I../DerelictSDL -I../DerelictUtil 
    99     
    1010SDLTTF.SRC.DIR = $(SRC.DIR)/derelict/sdl 

  • trunk/DerelictSDLttf/derelict/sdl/ttf.d

    r90 r91  
    2929 
    3030 
    31 private import derelict.sdl.sdl; 
    32 private import std.loader; 
     31private 
     32{ 
     33    import derelict.sdl.sdl; 
     34    import derelict.util.loader; 
     35} 
    3336 
    3437 
    …… 
    163166// Loader 
    164167//============================================================================== 
    165 private HXModule hsdlttf; 
    166  
    167  
    168 private void* getProc(char[] procname) 
    169 { 
    170     void *symbol = ExeModule_GetSymbol(hsdlttf, procname); 
    171     if (symbol is null) 
    172         throw new Exception("Failed to load SDLMixer proc address " ~ procname); 
    173     return symbol; 
     168private SharedLib libSDLttf; 
     169 
     170 
     171private void* getProc(char[] procName) 
     172{ 
     173    return Derelict_GetProc(libSDLttf, procName); 
    174174} 
    175175 
    …… 
    216216public void DerelictSDLttf_Load(char[] libName) 
    217217{ 
    218     if (hsdlttf !== null) 
     218    if (libSDLttf !== null) 
    219219        return; 
    220220 
    221     hsdlttf = ExeModule_Load(libName); 
    222  
    223     if(hsdlttf is null) 
    224         throw new Exception("Failed to load the SDL_ttf shared library."); 
    225  
     221    libSDLttf = Derelict_LoadSharedLib(libName); 
    226222    load(); 
    227223} 
    …… 
    237233public void DerelictSDLttf_Unload() 
    238234{ 
    239     if(hsdlttf !== null) 
    240         ExeModule_Release(hsdlttf); 
     235    Derelict_UnloadSharedLib(libSDLttf); 
    241236} 
    242237