Changeset 38

Timestamp:

07/26/04 09:03:06 (4 years ago)

Author:

aldacron

Message:

*[DerelictGL] small cosmetic change to gl.d (moved a variable declaration to the top of the file)
*[DerelictSDL] sdl.d now initializes and shuts down std.loader just like gl.d does
*[DerelictSDL] in sdl.d, moved the calls to getProc from DerelictSDL_Load to a new, internal load() function
*[DerelictPY] in python.d, rewrote std.loader initialization so that it matches gl.d and sdl.d

Files:

• trunk/DerelictGL/derelict/opengl/gl.d (modified) (2 diffs)
• trunk/DerelictPY/derelict/python/python.d (modified) (5 diffs)
• trunk/DerelictSDL/derelict/sdl/sdl.d (modified) (3 diffs)

trunk/DerelictGL/derelict/opengl/gl.d

@@ -193 +193 @@
-
-private HXModule hgl;
+private bit exeModuleInited = false; 
-
-private void* getProc(char[] procname)
@@ -542 +543 @@
-}
-
-private bit exeModuleInited = false; 
-
-/*!
-* Loads the shared lib and core GL 1.1 functions. If the shared lib or any of

trunk/DerelictPY/derelict/python/python.d

@@ -18 +18 @@
-
-private HXModule hpy;
+private bit exeModuleInited = false; 
-
-private void* getProc(char[] procname)
@@ -50 +51 @@
-    c_sum = cast(pfc_sum)getProc("_Py_c_sum");
-    c_diff = cast(pfc_diff)getProc("_Py_c_diff");
-
+"
-    c_prod = cast(pfc_prod)getProc("_Py_c_prod");
-    c_quot = cast(pfc_quot)getProc("_Py_c_quot");
@@ -58 +59 @@
-    PyProperty_Type = cast(PyTypeObject*)getProc("PyProperty_Type");
-    PyDescr_NewMethod = cast(pfPyDescr_NewMethod)getProc("PyDescr_NewMethod");
-Method)getProc("PyDescr_New
+ClassMethod)getProc("PyDescr_NewClass
-    PyDescr_NewMember = cast(pfPyDescr_NewMember)getProc("PyDescr_NewMember");
-    PyDescr_NewGetSet = cast(pfPyDescr_NewGetSet)getProc("PyDescr_NewGetSet");
@@ -96 +97 @@
-        hpy = ExeModule_Load("python23.dll");
-        
+    if(ExeModule_Init() == -1)
+        throw new Exception("ExeModule initialization failed");
+        
+    exeModuleInited = true; 
+        
-    load(); 
-}
-
-static this()
-{
-    ExeModule_Init();
-}
-
@@ -107 +108 @@
-{
-    ExeModule_Release(hpy);
-
+
+
+
-}

trunk/DerelictSDL/derelict/sdl/sdl.d

@@ -48 +48 @@
-
-private HXModule hsdl;
+private bit exeModuleInited = false;
-
-private void* getProc(char[] procname)
@@ -57 +58 @@
-}
-
-ublic void DerelictSDL_L
+rivate void l
-{
-    if(hsdl !== null)
-        return;
-        
-    version(Windows)
-        hsdl = ExeModule_Load("sdl.dll");   
-    
-    // active.d
-    SDL_GetAppState = cast(pfSDL_GetAppState)getProc("SDL_GetAppState");
@@ -274 +269 @@
-}
-
+public void DerelictSDL_Load()
+{
+    if(hsdl !== null)
+        return;
+        
+    if(ExeModule_Init() == -1)
+        throw new Exception("ExeModule initialization failed");
+        
+    exeModuleInited = true; 
+        
+    version(Windows)
+        hsdl = ExeModule_Load("sdl.dll");   
+    
+    load();
+}
+
-static ~this()
-{
-    ExeModule_Release(hsdl);
+    
+    if(exeModuleInited)
+        ExeModule_Uninit();
-}
-