3 files changed, 21 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 899334a..4042eca 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ libdl.a: $(SOURCES)
         $(RANLIB) $@

 

 libdl.dll: $(SOURCES)

-        $(CC) $(CFLAGS) $(SHFLAGS) -DDLFCN_WIN32_SHARED -shared -o $@ $^

+        $(CC) $(CFLAGS) $(SHFLAGS) -DDLFCN_WIN32_SHARED -D_DllMainCRTStartup=DllMainCRTStartup -nostartfiles -nostdlib -lkernel32 -shared -o $@ $^

 

 libdl.lib: libdl.dll

         $(LIBCMD) /machine:i386 /def:libdl.def

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9066e65..5dc21d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,15 @@ set_target_properties(dl PROPERTIES DEFINE_SYMBOL "")
 
 # set shared mode for compiling library and propagate mode to cmake clients
 if (BUILD_SHARED_LIBS)
+    # for non-debug shared mode, avoid linking to CRT library as it is not needed
+    if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+        if (MSVC)
+            set_property(TARGET dl APPEND_STRING PROPERTY COMPILE_FLAGS "/Zl")
+        else (MSVC)
+            set_property(TARGET dl APPEND_STRING PROPERTY COMPILE_FLAGS "-D_DllMainCRTStartup=DllMainCRTStartup")
+            set_property(TARGET dl APPEND_STRING PROPERTY LINK_FLAGS "-nostartfiles -nostdlib -lkernel32")
+        endif (MSVC)
+    endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     target_compile_definitions(dl PUBLIC DLFCN_WIN32_SHARED)
 endif (BUILD_SHARED_LIBS)
 
diff --git a/src/dlfcn.c b/src/dlfcn.c
index c128579..5ddf1a7 100644
--- a/src/dlfcn.c
+++ b/src/dlfcn.c
@@ -955,4 +955,15 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
     (void) lpvReserved;

     return TRUE;

 }

+

+/* For non-debug DLL builds defines DLL entry point which avoids using CRT library */

+#if !defined( _DEBUG )

+#ifdef __cplusplus

+extern "C"

+#endif

+BOOL WINAPI _DllMainCRTStartup( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )

+{

+    return DllMain( hinstDLL, fdwReason, lpvReserved );

+}

+#endif

 #endif