Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.

Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
This commit is contained in:
Roman Donchenko
2013-07-26 14:35:40 +04:00
parent be8b3687f4
commit ee182eb086
2 changed files with 3 additions and 2 deletions

View File

@@ -779,7 +779,7 @@ cvGetModuleInfo( const char* name, const char **version, const char **plugin_lis
*plugin_list = plugin_list_buf;
}
#if defined BUILD_SHARED_LIBS && defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
#if defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID );
BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID )