mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-26 05:50:32 +05:00
* Initial Nglib OCC support trials
* Added a new compile target for Nglib (Release(OCC)) * Netgen and Nglib solution files updated to remove non-existent files and add new source files into project
This commit is contained in:
parent
e7c9a77dbe
commit
0b26451049
@ -20,6 +20,9 @@
|
|||||||
#include <geometry2d.hpp>
|
#include <geometry2d.hpp>
|
||||||
#include <meshing.hpp>
|
#include <meshing.hpp>
|
||||||
|
|
||||||
|
#ifdef OCCGEOMETRY
|
||||||
|
#include <occgeom.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace netgen {
|
namespace netgen {
|
||||||
@ -579,6 +582,77 @@ DLL_HEADER void Ng_STL_AddEdge (Ng_STL_Geometry * geom,
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef OCCGEOMETRY
|
||||||
|
// --------------------- OCC Geometry / Meshing Utility Functions -------------------
|
||||||
|
|
||||||
|
// Create new OCC Geometry Object
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_NewGeometry ()
|
||||||
|
{
|
||||||
|
return (Ng_OCC_Geometry*)(void*)new OCCGeometry;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Loads geometry from STEP File
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_STEP (const char * filename)
|
||||||
|
{
|
||||||
|
Ng_OCC_Geometry * geo = Ng_OCC_NewGeometry();
|
||||||
|
|
||||||
|
geo = (Ng_OCC_Geometry *)LoadOCC_STEP(filename);
|
||||||
|
|
||||||
|
return (geo);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Loads geometry from IGES File
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_IGES (const char * filename)
|
||||||
|
{
|
||||||
|
Ng_OCC_Geometry * geo = Ng_OCC_NewGeometry();
|
||||||
|
|
||||||
|
geo = (Ng_OCC_Geometry *)LoadOCC_IGES(filename);
|
||||||
|
|
||||||
|
return (geo);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Loads geometry from BREP File
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_BREP (const char * filename)
|
||||||
|
{
|
||||||
|
Ng_OCC_Geometry * geo = Ng_OCC_NewGeometry();
|
||||||
|
|
||||||
|
geo = (Ng_OCC_Geometry *)LoadOCC_BREP(filename);
|
||||||
|
|
||||||
|
return (geo);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Extract a
|
||||||
|
DLL_HEADER Ng_Result Ng_OCC_GetFMap(Ng_OCC_Geometry * geom,
|
||||||
|
TopTools_IndexedMapOfShape & FMap)
|
||||||
|
{
|
||||||
|
OCCGeometry* occgeom = (OCCGeometry*)geom;
|
||||||
|
FMap = occgeom->fmap;
|
||||||
|
|
||||||
|
if(FMap.Extent())
|
||||||
|
{
|
||||||
|
return NG_OK;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------ End - OCC Geometry / Meshing Utility Functions ----------------
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DLL_HEADER Ng_Meshing_Parameters :: Ng_Meshing_Parameters()
|
DLL_HEADER Ng_Meshing_Parameters :: Ng_Meshing_Parameters()
|
||||||
{
|
{
|
||||||
maxh = 1000;
|
maxh = 1000;
|
||||||
|
@ -57,6 +57,10 @@ typedef void * Ng_Geometry_2D;
|
|||||||
/// Data type for NETGEN STL geometry
|
/// Data type for NETGEN STL geometry
|
||||||
typedef void * Ng_STL_Geometry;
|
typedef void * Ng_STL_Geometry;
|
||||||
|
|
||||||
|
#ifdef OCCGEOMETRY
|
||||||
|
/// Data type for NETGEN OpenCascade geometry
|
||||||
|
typedef void * Ng_OCC_Geometry;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// *** Special Enum types used within Netgen ***********
|
// *** Special Enum types used within Netgen ***********
|
||||||
@ -544,4 +548,29 @@ DLL_HEADER Ng_Result Ng_ACIS_GenerateSurfaceMesh (Ng_ACIS_Geometry * geom,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef OCCGEOMETRY
|
||||||
|
|
||||||
|
// **********************************************************
|
||||||
|
// ** OpenCascade Geometry / Meshing Utilities **
|
||||||
|
// **********************************************************
|
||||||
|
|
||||||
|
// Create new OCC Geometry Object
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_NewGeometry ();
|
||||||
|
|
||||||
|
// Loads geometry from STEP file
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_STEP (const char * filename);
|
||||||
|
|
||||||
|
// Loads geometry from IGES file
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_IGES (const char * filename);
|
||||||
|
|
||||||
|
// Loads geometry from BREP file
|
||||||
|
DLL_HEADER Ng_OCC_Geometry * Ng_OCC_Load_BREP (const char * filename);
|
||||||
|
|
||||||
|
// Get the face map of an already loaded OCC geometry
|
||||||
|
DLL_HEADER Ng_Result Ng_OCC_GetFMap(Ng_OCC_Geometry * geom,
|
||||||
|
TopTools_IndexedMapOfShape & FMap);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -767,6 +767,10 @@
|
|||||||
RelativePath="..\libsrc\general\autoptr.hpp"
|
RelativePath="..\libsrc\general\autoptr.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\meshing\basegeom.hpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\meshing\bcfunctions.hpp"
|
RelativePath="..\libsrc\meshing\bcfunctions.hpp"
|
||||||
>
|
>
|
||||||
@ -796,11 +800,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\csg\csg.hpp"
|
RelativePath="..\libsrc\include\csg.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\csg.hpp"
|
RelativePath="..\libsrc\csg\csg.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -872,11 +876,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\geometry2d.hpp"
|
RelativePath="..\libsrc\geom2d\geometry2d.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\geom2d\geometry2d.hpp"
|
RelativePath="..\libsrc\include\geometry2d.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -916,11 +920,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\gprim.hpp"
|
RelativePath="..\libsrc\gprim\gprim.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\gprim\gprim.hpp"
|
RelativePath="..\libsrc\include\gprim.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -976,11 +980,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\linalg.hpp"
|
RelativePath="..\libsrc\linalg\linalg.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\linalg\linalg.hpp"
|
RelativePath="..\libsrc\include\linalg.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -1004,11 +1008,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\meshing\meshing.hpp"
|
RelativePath="..\libsrc\include\meshing.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\meshing.hpp"
|
RelativePath="..\libsrc\meshing\meshing.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -1035,10 +1039,6 @@
|
|||||||
RelativePath="..\libsrc\meshing\meshtype.hpp"
|
RelativePath="..\libsrc\meshing\meshtype.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\libsrc\general\moveablemem.hpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\general\mpi_interface.hpp"
|
RelativePath="..\libsrc\general\mpi_interface.hpp"
|
||||||
>
|
>
|
||||||
@ -1104,11 +1104,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\opti.hpp"
|
RelativePath="..\libsrc\linalg\opti.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\linalg\opti.hpp"
|
RelativePath="..\libsrc\include\opti.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -1216,11 +1216,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\stlgeom.hpp"
|
RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
|
RelativePath="..\libsrc\include\stlgeom.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -1284,11 +1284,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\visualization\visual.hpp"
|
RelativePath="..\libsrc\include\visual.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\visual.hpp"
|
RelativePath="..\libsrc\visualization\visual.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -1557,10 +1557,6 @@
|
|||||||
RelativePath="..\libsrc\meshing\meshtype.cpp"
|
RelativePath="..\libsrc\meshing\meshtype.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\libsrc\general\moveablemem.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\meshing\msghandler.cpp"
|
RelativePath="..\libsrc\meshing\msghandler.cpp"
|
||||||
>
|
>
|
||||||
|
@ -7,6 +7,8 @@ Global
|
|||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Win32 = Debug|Win32
|
Debug|Win32 = Debug|Win32
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
|
Release(OCC)|Win32 = Release(OCC)|Win32
|
||||||
|
Release(OCC)|x64 = Release(OCC)|x64
|
||||||
Release|Win32 = Release|Win32
|
Release|Win32 = Release|Win32
|
||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
@ -15,6 +17,10 @@ Global
|
|||||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|Win32.Build.0 = Debug|Win32
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|x64.ActiveCfg = Debug|x64
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|x64.Build.0 = Debug|x64
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|Win32.ActiveCfg = Release(OCC)|Win32
|
||||||
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|Win32.Build.0 = Release(OCC)|Win32
|
||||||
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|x64.ActiveCfg = Release(OCC)|x64
|
||||||
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release(OCC)|x64.Build.0 = Release(OCC)|x64
|
||||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release|Win32.ActiveCfg = Release|Win32
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release|Win32.Build.0 = Release|Win32
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release|Win32.Build.0 = Release|Win32
|
||||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release|x64.ActiveCfg = Release|x64
|
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
@ -98,6 +98,86 @@
|
|||||||
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)""
|
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)""
|
||||||
/>
|
/>
|
||||||
</Configuration>
|
</Configuration>
|
||||||
|
<Configuration
|
||||||
|
Name="Debug|x64"
|
||||||
|
OutputDirectory="$(SolutionDir)$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
||||||
|
IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
||||||
|
ConfigurationType="2"
|
||||||
|
CharacterSet="1"
|
||||||
|
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName)_$(PlatformName).htm"
|
||||||
|
>
|
||||||
|
<Tool
|
||||||
|
Name="VCPreBuildEventTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCCustomBuildTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXMLDataGeneratorTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCMIDLTool"
|
||||||
|
TargetEnvironment="3"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCCLCompilerTool"
|
||||||
|
Optimization="0"
|
||||||
|
AdditionalIncludeDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\nglib";"$(SolutionDir)..\""
|
||||||
|
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA"
|
||||||
|
MinimalRebuild="true"
|
||||||
|
BasicRuntimeChecks="3"
|
||||||
|
RuntimeLibrary="3"
|
||||||
|
UsePrecompiledHeader="0"
|
||||||
|
WarningLevel="3"
|
||||||
|
DebugInformationFormat="3"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCResourceCompilerTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCPreLinkEventTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCLinkerTool"
|
||||||
|
AdditionalDependencies="pthreadVC2_64.lib"
|
||||||
|
LinkIncremental="2"
|
||||||
|
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
|
||||||
|
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
|
||||||
|
GenerateDebugInformation="true"
|
||||||
|
SubSystem="2"
|
||||||
|
TargetMachine="17"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCALinkTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCManifestTool"
|
||||||
|
OutputManifestFile="$(OutDir)\$(TargetFileName).embed.manifest"
|
||||||
|
ManifestResourceFile="$(OutDir)\$(TargetFileName).embed.manifest.res"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXDCMakeTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCBscMakeTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCFxCopTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCAppVerifierTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCPostBuildEventTool"
|
||||||
|
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)""
|
||||||
|
/>
|
||||||
|
</Configuration>
|
||||||
<Configuration
|
<Configuration
|
||||||
Name="Release|Win32"
|
Name="Release|Win32"
|
||||||
OutputDirectory="$(SolutionDir)$(ProjectName)\$(ConfigurationName)"
|
OutputDirectory="$(SolutionDir)$(ProjectName)\$(ConfigurationName)"
|
||||||
@ -182,11 +262,13 @@
|
|||||||
/>
|
/>
|
||||||
</Configuration>
|
</Configuration>
|
||||||
<Configuration
|
<Configuration
|
||||||
Name="Debug|x64"
|
Name="Release|x64"
|
||||||
OutputDirectory="$(SolutionDir)$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
OutputDirectory="$(SolutionDir)$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
||||||
IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
||||||
ConfigurationType="2"
|
ConfigurationType="2"
|
||||||
CharacterSet="1"
|
CharacterSet="1"
|
||||||
|
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
|
||||||
|
WholeProgramOptimization="1"
|
||||||
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName)_$(PlatformName).htm"
|
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName)_$(PlatformName).htm"
|
||||||
>
|
>
|
||||||
<Tool
|
<Tool
|
||||||
@ -207,14 +289,20 @@
|
|||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="3"
|
||||||
|
InlineFunctionExpansion="2"
|
||||||
|
EnableIntrinsicFunctions="true"
|
||||||
|
FavorSizeOrSpeed="1"
|
||||||
AdditionalIncludeDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\nglib";"$(SolutionDir)..\""
|
AdditionalIncludeDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\nglib";"$(SolutionDir)..\""
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA"
|
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA"
|
||||||
MinimalRebuild="true"
|
RuntimeLibrary="2"
|
||||||
BasicRuntimeChecks="3"
|
EnableFunctionLevelLinking="true"
|
||||||
RuntimeLibrary="3"
|
EnableEnhancedInstructionSet="1"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
ObjectFile="$(IntDir)\"
|
||||||
|
ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
|
||||||
|
XMLDocumentationFileName="$(IntDir)\"
|
||||||
|
WarningLevel="2"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@ -229,11 +317,8 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
AdditionalDependencies="pthreadVC2_64.lib"
|
AdditionalDependencies="pthreadVC2_64.lib"
|
||||||
LinkIncremental="2"
|
|
||||||
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
|
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
|
||||||
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
|
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
|
||||||
GenerateDebugInformation="true"
|
|
||||||
SubSystem="2"
|
|
||||||
TargetMachine="17"
|
TargetMachine="17"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
@ -262,9 +347,92 @@
|
|||||||
/>
|
/>
|
||||||
</Configuration>
|
</Configuration>
|
||||||
<Configuration
|
<Configuration
|
||||||
Name="Release|x64"
|
Name="Release(OCC)|Win32"
|
||||||
OutputDirectory="$(SolutionDir)$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
OutputDirectory="$(SolutionDir)$(ProjectName)\$(ConfigurationName)"
|
||||||
IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
|
||||||
|
ConfigurationType="2"
|
||||||
|
CharacterSet="1"
|
||||||
|
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
|
||||||
|
WholeProgramOptimization="1"
|
||||||
|
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
|
||||||
|
>
|
||||||
|
<Tool
|
||||||
|
Name="VCPreBuildEventTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCCustomBuildTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXMLDataGeneratorTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCMIDLTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCCLCompilerTool"
|
||||||
|
Optimization="3"
|
||||||
|
InlineFunctionExpansion="2"
|
||||||
|
EnableIntrinsicFunctions="true"
|
||||||
|
FavorSizeOrSpeed="1"
|
||||||
|
AdditionalIncludeDirectories=""$(CASROOT)\inc";"$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\nglib";"$(SolutionDir)..\""
|
||||||
|
PreprocessorDefinitions="WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;OCCGEOMETRY;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA"
|
||||||
|
RuntimeLibrary="2"
|
||||||
|
EnableFunctionLevelLinking="true"
|
||||||
|
EnableEnhancedInstructionSet="1"
|
||||||
|
UsePrecompiledHeader="0"
|
||||||
|
ObjectFile="$(IntDir)\"
|
||||||
|
ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
|
||||||
|
XMLDocumentationFileName="$(IntDir)\"
|
||||||
|
WarningLevel="2"
|
||||||
|
DebugInformationFormat="3"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCResourceCompilerTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCPreLinkEventTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCLinkerTool"
|
||||||
|
AdditionalDependencies="pthreadVC2.lib TKernel.lib TKGeomBase.lib TKMath.lib TKG2d.lib TKG3d.lib TKXSBase.lib TKOffset.lib TKFillet.lib TKShHealing.lib TKMesh.lib TKMeshVS.lib TKTopAlgo.lib TKGeomAlgo.lib TKBool.lib TKPrim.lib TKBO.lib TKIGES.lib TKBRep.lib TKSTEPBase.lib TKSTEP.lib TKSTL.lib TKSTEPAttr.lib TKSTEP209.lib TKXDESTEP.lib TKXDEIGES.lib TKXCAF.lib TKDCAF.lib TKLCAF.lib"
|
||||||
|
AdditionalLibraryDirectories="$(CASROOT)\win32\lib;"$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
|
||||||
|
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCALinkTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCManifestTool"
|
||||||
|
OutputManifestFile="$(OutDir)\$(TargetFileName).embed.manifest"
|
||||||
|
ManifestResourceFile="$(OutDir)\$(TargetFileName).embed.manifest.res"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXDCMakeTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCBscMakeTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCFxCopTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCAppVerifierTool"
|
||||||
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCPostBuildEventTool"
|
||||||
|
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)""
|
||||||
|
/>
|
||||||
|
</Configuration>
|
||||||
|
<Configuration
|
||||||
|
Name="Release(OCC)|x64"
|
||||||
|
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||||
|
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
ConfigurationType="2"
|
ConfigurationType="2"
|
||||||
CharacterSet="1"
|
CharacterSet="1"
|
||||||
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
|
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
|
||||||
@ -563,10 +731,6 @@
|
|||||||
RelativePath="..\libsrc\meshing\meshtype.cpp"
|
RelativePath="..\libsrc\meshing\meshtype.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\libsrc\general\moveablemem.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\meshing\msghandler.cpp"
|
RelativePath="..\libsrc\meshing\msghandler.cpp"
|
||||||
>
|
>
|
||||||
@ -591,6 +755,18 @@
|
|||||||
RelativePath="..\nglib\nglib.cpp"
|
RelativePath="..\nglib\nglib.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\occgenmesh.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\occgeom.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\occmeshsurf.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\general\optmem.cpp"
|
RelativePath="..\libsrc\general\optmem.cpp"
|
||||||
>
|
>
|
||||||
@ -889,6 +1065,10 @@
|
|||||||
RelativePath="..\libsrc\general\autoptr.hpp"
|
RelativePath="..\libsrc\general\autoptr.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\meshing\basegeom.hpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\meshing\bisect.hpp"
|
RelativePath="..\libsrc\meshing\bisect.hpp"
|
||||||
>
|
>
|
||||||
@ -914,11 +1094,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\csg\csg.hpp"
|
RelativePath="..\libsrc\include\csg.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\csg.hpp"
|
RelativePath="..\libsrc\csg\csg.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -1030,11 +1210,11 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\gprim.hpp"
|
RelativePath="..\libsrc\gprim\gprim.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\gprim\gprim.hpp"
|
RelativePath="..\libsrc\include\gprim.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
@ -1141,10 +1321,6 @@
|
|||||||
RelativePath="..\libsrc\meshing\meshtype.hpp"
|
RelativePath="..\libsrc\meshing\meshtype.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\libsrc\general\moveablemem.hpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\general\mpi_interface.hpp"
|
RelativePath="..\libsrc\general\mpi_interface.hpp"
|
||||||
>
|
>
|
||||||
@ -1189,6 +1365,10 @@
|
|||||||
RelativePath="..\libsrc\include\occgeom.hpp"
|
RelativePath="..\libsrc\include\occgeom.hpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\occmeshsurf.hpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\libsrc\include\opti.hpp"
|
RelativePath="..\libsrc\include\opti.hpp"
|
||||||
>
|
>
|
||||||
@ -1354,6 +1534,62 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
|
<Filter
|
||||||
|
Name="Ext Header Files"
|
||||||
|
>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Inter2d.hxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Inter3d.hxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Loop.hxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Loop2d.hxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Loop3d.hxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Spliter.hxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
</Filter>
|
||||||
|
<Filter
|
||||||
|
Name="Ext Source Files"
|
||||||
|
>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Inter2d.cxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Inter3d.cxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Loop.cxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Loop2d.cxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Loop3d.cxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\libsrc\occ\Partition_Spliter.cxx"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
</Filter>
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
Loading…
Reference in New Issue
Block a user