OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code Packages Releases Activity

0028983: Configuration - HAVE_NO_DLL causes compilation to fail on MSVC

Browse Source
This commit is contained in:
Thomas Krijnen 2017-08-10 10:01:40 +02:00 committed by bugmaster
parent a318d719e7
commit d37ac0c26e
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Standard/Standard_Macro.hxx
View File

@ -72,23 +72,7 @@
#define Standard_ENABLE_DEPRECATION_WARNINGS #define Standard_ENABLE_DEPRECATION_WARNINGS
#endif #endif
//====================================================== # ifdef _WIN32
// Windows-specific definitions
//======================================================
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifndef Standard_EXPORT
# define Standard_EXPORT __declspec( dllexport )
// For global variables :
# define Standard_EXPORTEXTERN __declspec( dllexport ) extern
# define Standard_EXPORTEXTERNC extern "C" __declspec( dllexport )
# endif /* Standard_EXPORT */
# ifndef Standard_IMPORT
# define Standard_IMPORT __declspec( dllimport ) extern
# define Standard_IMPORTC extern "C" __declspec( dllimport )
# endif /* Standard_IMPORT */
// We must be careful including windows.h: it is really poisonous stuff! // We must be careful including windows.h: it is really poisonous stuff!
// The most annoying are #defines of many identifiers that you could use in // The most annoying are #defines of many identifiers that you could use in
@ -132,10 +116,30 @@
#define NOIME NOIME #define NOIME NOIME
#endif #endif
#endif
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
//======================================================
// Windows-specific definitions
//======================================================
# ifndef Standard_EXPORT
# define Standard_EXPORT __declspec( dllexport )
// For global variables :
# define Standard_EXPORTEXTERN __declspec( dllexport ) extern
# define Standard_EXPORTEXTERNC extern "C" __declspec( dllexport )
# endif /* Standard_EXPORT */
# ifndef Standard_IMPORT
# define Standard_IMPORT __declspec( dllimport ) extern
# define Standard_IMPORTC extern "C" __declspec( dllimport )
# endif /* Standard_IMPORT */
# else /* UNIX */ # else /* UNIX */
//====================================================== //======================================================
// UNIX definitions // UNIX / static library definitions
//====================================================== //======================================================
# ifndef Standard_EXPORT # ifndef Standard_EXPORT