do not include DLLMain into core when it is a static library (thanks to aglinarth for the patch)

14 years ago · 62b966460d
parent ae8f2eeac2
commit 62b966460d
1 changed files with 1 additions and 1 deletions
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@ -748,7 +748,7 @@ cvGetModuleInfo( const char* name, const char **version, const char **plugin_lis
        *plugin_list = plugin_list_buf;
 }

-#if defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
+#if defined OPENCV_BUILD_SHARED_LIB && defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
 BOOL WINAPI DllMain( HINSTANCE, DWORD  fdwReason, LPVOID )
 {
    if( fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH )