generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-05-06 12:06:20 +00:00
parent ae8f2eeac2
commit 62b966460d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/system.cpp
View File

@ -748,7 +748,7 @@ cvGetModuleInfo( const char* name, const char **version, const char **plugin_lis
*plugin_list = plugin_list_buf; *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 ) BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID )
{ {
if( fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH ) if( fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH )