ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-13 06:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

* Corrected WINNT Preprocessor macro for nglib win32 and x64

Browse Source 
* Now uses pthread-w64 for x64
This commit is contained in:
Philippose Rajan 2010-03-03 22:02:42 +00:00
parent 95c0d356e0
commit 31587d6097
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
windows/nglib.vcproj
View File

@ -46,7 +46,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
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;_DEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -125,8 +125,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w64\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -147,7 +147,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="pthreadVC2_64.lib" AdditionalDependencies="pthreadVC2_64.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w64\lib&quot;"
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest" ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -210,7 +210,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
@ -293,8 +293,8 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w64\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
@ -317,7 +317,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="pthreadVC2_64.lib" AdditionalDependencies="pthreadVC2_64.lib"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\pthread-w64\lib&quot;"
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest" ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
TargetMachine="17" TargetMachine="17"
/> />
@ -378,7 +378,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="&quot;$(CASROOT)\inc&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;" AdditionalIncludeDirectories="&quot;$(CASROOT)\inc&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;"
PreprocessorDefinitions="WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;OCCGEOMETRY;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA" PreprocessorDefinitions="WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;OCCGEOMETRY;_WIN32_WINNT=0x0502"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
@ -461,8 +461,8 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="&quot;$(CASROOT)\inc&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;" AdditionalIncludeDirectories="&quot;$(CASROOT)\inc&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w64\include&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\nglib&quot;;&quot;$(SolutionDir)..\&quot;"
PreprocessorDefinitions="WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;OCCGEOMETRY;_OCC64;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA" PreprocessorDefinitions="WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;OCCGEOMETRY;_OCC64;_WIN32_WINNT=0x0502"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
@ -485,7 +485,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="pthreadVC2_64.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 TKLCAF.lib" AdditionalDependencies="pthreadVC2_64.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 TKLCAF.lib"
AdditionalLibraryDirectories="$(CASROOT)\win64\lib;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;" AdditionalLibraryDirectories="$(CASROOT)\win64\lib;&quot;$(SolutionDir)..\..\ext_libs\pthread-w64\lib&quot;"
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest" ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
TargetMachine="17" TargetMachine="17"
/> />
@ -999,6 +999,10 @@
RelativePath="..\libsrc\interface\writejcm.cpp" RelativePath="..\libsrc\interface\writejcm.cpp"
> >
</File> </File>
<File
RelativePath="..\libsrc\interface\writeOpenFOAM15x.cpp"
>
</File>
<File <File
RelativePath="..\libsrc\interface\writepermas.cpp" RelativePath="..\libsrc\interface\writepermas.cpp"
> >
@ -1166,11 +1170,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\geom2d\geometry2d.hpp" RelativePath="..\libsrc\include\geometry2d.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\geometry2d.hpp" RelativePath="..\libsrc\geom2d\geometry2d.hpp"
> >
</File> </File>
<File <File
@ -1210,11 +1214,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
@ -1266,11 +1270,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
@ -1290,11 +1294,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
@ -1330,11 +1334,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\general\myadt.hpp" RelativePath="..\libsrc\include\myadt.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\myadt.hpp" RelativePath="..\libsrc\general\myadt.hpp"
> >
</File> </File>
<File <File
@ -1370,11 +1374,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\linalg\opti.hpp" RelativePath="..\libsrc\include\opti.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\opti.hpp" RelativePath="..\libsrc\linalg\opti.hpp"
> >
</File> </File>
<File <File