Export dllmain and combine to 1

Signed-off-by: Brandon Yates <[email protected]>

Author: bmyates

source/lib/windows/lib_init.cpp

@@ -7,15 +7,32 @@
  */
 
 #include "../ze_lib.h"
+#ifndef DYNAMIC_LOAD_LOADER
+#include "../loader/ze_loader.h"
+#endif
 
 namespace ze_lib
 {
-    BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
+#ifdef DYNAMIC_LOAD_LOADER
+    export "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
         if (fdwReason == DLL_PROCESS_DETACH) {
             delete context;
         } else if (fdwReason == DLL_PROCESS_ATTACH) {
             context = new context_t;
         }
         return TRUE;
     }       
+#else
+    extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
+        if (fdwReason == DLL_PROCESS_DETACH) {
+            delete context;
+            delete loader::context;
+        } else if (fdwReason == DLL_PROCESS_ATTACH) {
+            context = new context_t;
+            loader::context = new loader::context_t;
+        }
+        return TRUE;
+    }      
+
+#endif
 }

source/loader/windows/loader_init.cpp

@@ -10,12 +10,14 @@
 
 namespace loader
 {
-    BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
+#ifdef DYNAMIC_LOAD_LOADER
+    extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
         if (fdwReason == DLL_PROCESS_DETACH) {
             delete context;
         } else if (fdwReason == DLL_PROCESS_ATTACH) {
             context = new context_t;
         }
         return TRUE;
     }       
+#endif
 }