OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-18 14:27:39 +03:00
Code Activity

0022651: Impossible to build OCC as static library due to using Standard_EXPORT instead of Standard_API

Browse Source 
All library-specific macros for defining export / import properties of symbols on Windows (like Standard_API, __Draw_API, _math_API etc.) are eliminated.
Common macro Standard_EXPORT is used in all places where it is necessary.

New macro OCCT_STATIC_BUILD is defined for disabling Standard_EXPORT, to be used instead of HAVE_NO_DLL, though the latter is still supported as well (for compatibility).

To allow building OCCT in static mode on Windows after these changes:
- Files OSD_WNT_1.hxx and OSD_WNT_BREAK.hxx are removed; useful declarations are moved to OSD_WNT.hxx
- In the class IVtkVTK_ShapeData, static fields ARRNAME_MESH_TYPES and ARRNAME_SUBSHAPE_IDS are converted to static inline functions
- Global array ChoixRef defined in IntImp_ComputeTangence.cxx is converted to static function returning element of the array by index
- Unused class Quantity_Convert is removed (it had static field accessed by inline method)
- Struct Approx_Data defined in the same way in BRepApprox_Approx.hxx and GeomInt_WLApprox.hxx is made private member of these classes to avoid name clash
- Some C++ files producing no object code are removed
- In NCollection_EBTree.hxx and StdLPersistent_Collectio.hxx, definition of template virtual method is moved to class definition to avoid MSVC linker warnings on unused symbols
This commit is contained in:
abv
2018-03-15 13:07:48 +03:00
parent 8662560e2c
commit 68df847802
86 changed files with 465 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/AppBlend/AppBlend_AppSurf.gxx
View File

@@ -36,8 +36,9 @@
#include <AppDef_Variational.hxx>
static Standard_Boolean scal = 1;
extern Standard_Boolean AppBlend_GetContextSplineApprox();
extern Standard_Boolean AppBlend_GetContextApproxWithNoTgt();
Standard_EXPORT Standard_Boolean AppBlend_GetContextSplineApprox();
Standard_EXPORT Standard_Boolean AppBlend_GetContextApproxWithNoTgt();
// modified by EAP (Edward AGAPOV) Fri Jan 4 2002, bug OCC9
// --- keep pipe parametrized like path

20
src/AppBlend/AppBlend_Debug.cxx
View File

@@ -16,30 +16,18 @@
#include <Standard_Boolean.hxx>
#ifndef __AppBlend_API
# if defined(_WIN32) && !defined(HAVE_NO_DLL)
# ifdef __AppBlend_DLL
# define __AppBlend_API __declspec( dllexport )
# else
# define __AppBlend_API __declspec( dllimport )
# endif /*__AppBlend_DLL*/
# else
# define __AppBlend_API
# endif /*_WIN32*/
#endif /*__AppBlend_API*/
//****************************************************
// Functions to change the type of approx.
//****************************************************
static Standard_Boolean AppBlend_ContextSplineApprox = Standard_False;
__AppBlend_API extern void AppBlend_SetContextSplineApprox(const Standard_Boolean b)
Standard_EXPORT void AppBlend_SetContextSplineApprox(const Standard_Boolean b)
{ AppBlend_ContextSplineApprox = b; }
__AppBlend_API extern Standard_Boolean AppBlend_GetContextSplineApprox()
Standard_EXPORT Standard_Boolean AppBlend_GetContextSplineApprox()
{ return AppBlend_ContextSplineApprox; }
static Standard_Boolean AppBlend_ContextApproxWithNoTgt = Standard_False;
__AppBlend_API extern void AppBlend_SetContextApproxWithNoTgt(const Standard_Boolean b)
Standard_EXPORT void AppBlend_SetContextApproxWithNoTgt(const Standard_Boolean b)
{ AppBlend_ContextApproxWithNoTgt = b; }
__AppBlend_API extern Standard_Boolean AppBlend_GetContextApproxWithNoTgt()
Standard_EXPORT Standard_Boolean AppBlend_GetContextApproxWithNoTgt()
{ return AppBlend_ContextApproxWithNoTgt; }