Windows fixes

dgud · Oct 12, 2010 · 560cd80 · 560cd80
1 parent d6851ea
commit 560cd80
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/c_src/esdl_driver.c b/c_src/esdl_driver.c
@@ -201,6 +201,7 @@ sdl_driver_debug_control(ErlDrvData handle, unsigned op,
      gl_dispatch(sd, op, buf);
      sdl_free_binaries(sd);
      fprintf(stderr, "\r\n");
+     return 0;
   }
 }
 

diff --git a/c_src/esdl_gl.c b/c_src/esdl_gl.c
@@ -8,7 +8,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifndef _WIN32
 #include <dlfcn.h>
+#endif
 #include "esdl.h"
 
 int esdl_gl_initiated = 0;
@@ -20,14 +22,25 @@ ESDL_GL_DISPATCH esdl_gl_dispatch;
 typedef int (*ESDL_GL_INIT) ();
 
 #ifdef _WIN32
+#define RTLD_LAZY 0
+typedef HMODULE DL_LIB_P;
+
 void * dlsym(HMODULE Lib, const char *func) {
-   funcp = (void *) GetProcAddress(Lib, func);
+    void * funcp;
-   return funcp;
+    funcp = (void *) GetProcAddress(Lib, func);
+    return funcp;
+}
+
+HMODULE dlopen(const char *DLL, int unused) {
+    return LoadLibrary(DLL);
 }
+
+#else 
+typedef void * DL_LIB_P;
 #endif 
 
 void es_init_opengl(sdl_data *sd, int len, char *bp) {
-   void * LIBhandle;
+   DL_LIB_P LIBhandle;
    ESDL_GL_INIT init_opengl;
 
    char *start;