mirror of
https://github.com/NGSolve/netgen.git
synced 2025-03-01 23:45:43 +05:00
* Added 64-bit build target to Netgen and Nglib
* Modified the Post-Build scripts to handle Win32 and x64 build variants * Note#1: No OCC Support yet for 64-bit builds * Note#2: 64-bit targets are only maintained for MSVC 2008
This commit is contained in:
Philippose Rajan
parent
e7e48061ce
commit
091f525828
@ -6,19 +6,31 @@ EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug(OCC)|Win32 = Debug(OCC)|Win32
|
||||
Debug(OCC)|x64 = Debug(OCC)|x64
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release(OCC)|Win32 = Release(OCC)|Win32
|
||||
Release(OCC)|x64 = Release(OCC)|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug(OCC)|Win32.ActiveCfg = Debug(OCC)|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug(OCC)|Win32.Build.0 = Debug(OCC)|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug(OCC)|x64.ActiveCfg = Debug(OCC)|x64
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug(OCC)|x64.Build.0 = Debug(OCC)|x64
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Debug|x64.Build.0 = Debug|x64
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release(OCC)|Win32.ActiveCfg = Release(OCC)|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release(OCC)|Win32.Build.0 = Release(OCC)|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release(OCC)|x64.ActiveCfg = Release(OCC)|x64
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release(OCC)|x64.Build.0 = Release(OCC)|x64
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release|Win32.Build.0 = Release|Win32
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release|x64.ActiveCfg = Release|x64
|
||||
{87468946-A594-4101-81A4-A131F35261EF}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -12,6 +12,9 @@
|
||||
<Platform
|
||||
Name="Win32"
|
||||
/>
|
||||
<Platform
|
||||
Name="x64"
|
||||
/>
|
||||
</Platforms>
|
||||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
@ -98,7 +101,93 @@
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(ProjectDir)" "nginterface""
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.exp;*.lib;$(TargetPath)"
|
||||
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).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)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkLibraryDependencies="false"
|
||||
AdditionalDependencies="pthreadVC2_64.lib tcl85.lib tk85.lib tix84.lib Togl17.lib glu32.lib opengl32.lib"
|
||||
ShowProgress="0"
|
||||
Version=""
|
||||
LinkIncremental="0"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
|
||||
GenerateManifest="true"
|
||||
EnableUAC="true"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
ImportLibrary="$(OutDir)\nginterface.lib"
|
||||
TargetMachine="17"
|
||||
AllowIsolation="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -188,7 +277,99 @@
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(ProjectDir)" "nginterface""
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.exp;*.lib;$(TargetPath)"
|
||||
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl-64\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableEnhancedInstructionSet="1"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="2"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkLibraryDependencies="false"
|
||||
AdditionalDependencies="pthreadVC2_64.lib tcl85.lib tk85.lib tix84.lib Togl17.lib glu32.lib opengl32.lib"
|
||||
ShowProgress="0"
|
||||
OutputFile="$(OutDir)\$(ProjectName).exe"
|
||||
Version=""
|
||||
LinkIncremental="0"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl-64\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
|
||||
GenerateManifest="true"
|
||||
EnableUAC="true"
|
||||
GenerateDebugInformation="false"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
OptimizeForWindows98="0"
|
||||
ImportLibrary="$(OutDir)\nginterface.lib"
|
||||
TargetMachine="17"
|
||||
AllowIsolation="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -279,7 +460,99 @@
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(ProjectDir)" "nginterface""
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release(OCC)|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.exp;*.lib;$(TargetPath)"
|
||||
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).htm"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(CASROOT)\inc""
|
||||
PreprocessorDefinitions="WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;OCCGEOMETRY;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableEnhancedInstructionSet="1"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="2"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkLibraryDependencies="false"
|
||||
AdditionalDependencies="pthreadVC2.lib tcl85.lib tk85.lib tix84.lib Togl17.lib glu32.lib opengl32.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"
|
||||
ShowProgress="0"
|
||||
Version=""
|
||||
LinkIncremental="0"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib";"$(CASROOT)\win32\lib""
|
||||
GenerateManifest="true"
|
||||
EnableUAC="true"
|
||||
EmbedManagedResourceFile=""
|
||||
GenerateDebugInformation="false"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
OptimizeForWindows98="0"
|
||||
ImportLibrary="$(OutDir)\nginterface.lib"
|
||||
TargetMachine="17"
|
||||
AllowIsolation="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -364,7 +637,93 @@
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(ProjectDir)" "nginterface""
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug(OCC)|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.exp;*.lib;$(TargetPath)"
|
||||
BuildLogFile="$(SolutionDir)\BuildLog_$(ProjectName).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)..";"$(SolutionDir)..\ng";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\libsrc\interface";"$(SolutionDir)..\..\ext_libs\tcl\include";"$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(CASROOT)\inc""
|
||||
PreprocessorDefinitions="WIN32;WNT;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OCCGEOMETRY;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkLibraryDependencies="false"
|
||||
AdditionalDependencies="pthreadVC2.lib tcl85.lib tk85.lib tix84.lib Togl17.lib glu32.lib opengl32.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"
|
||||
ShowProgress="0"
|
||||
Version=""
|
||||
LinkIncremental="0"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib";"$(CASROOT)\win32\lib""
|
||||
GenerateManifest="true"
|
||||
EnableUAC="true"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
ImportLibrary="$(OutDir)\nginterface.lib"
|
||||
TargetMachine="17"
|
||||
AllowIsolation="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Running POSTBUILD Script...."
|
||||
CommandLine=""$(ProjectDir)\postBuild_netgen.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)" "nginterface""
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
|
||||
@ -6,13 +6,19 @@ EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Debug|Win32.ActiveCfg = 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.Build.0 = Debug|x64
|
||||
{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|x64.ActiveCfg = Release|x64
|
||||
{2E260C8C-595C-442A-A962-51AC06EF8143}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -12,6 +12,9 @@
|
||||
<Platform
|
||||
Name="Win32"
|
||||
/>
|
||||
<Platform
|
||||
Name="x64"
|
||||
/>
|
||||
</Platforms>
|
||||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
@ -92,7 +95,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(ProjectDir)""
|
||||
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)""
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -175,7 +178,172 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(ProjectDir)""
|
||||
CommandLine=""$(ProjectDir)\postBuild_nglib.bat" "$(ProjectName)" "$(TargetFileName)" "$(ConfigurationName)" "$(PlatformName)" "$(ProjectDir)""
|
||||
/>
|
||||
</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
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(SolutionDir)$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="2"
|
||||
CharacterSet="1"
|
||||
DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
|
||||
WholeProgramOptimization="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="3"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\include";"$(SolutionDir)..\libsrc\include";"$(SolutionDir)..\nglib";"$(SolutionDir)..\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;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_64.lib"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
|
||||
ManifestFile="$(OutDir)\$(TargetFileName).intermediate.manifest"
|
||||
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>
|
||||
</Configurations>
|
||||
@ -818,11 +986,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\geom2d\geometry2d.hpp"
|
||||
RelativePath="..\libsrc\include\geometry2d.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\include\geometry2d.hpp"
|
||||
RelativePath="..\libsrc\geom2d\geometry2d.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -862,11 +1030,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\gprim\gprim.hpp"
|
||||
RelativePath="..\libsrc\include\gprim.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\include\gprim.hpp"
|
||||
RelativePath="..\libsrc\gprim\gprim.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -918,11 +1086,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\include\linalg.hpp"
|
||||
RelativePath="..\libsrc\linalg\linalg.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\linalg\linalg.hpp"
|
||||
RelativePath="..\libsrc\include\linalg.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -942,11 +1110,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\meshing\meshing.hpp"
|
||||
RelativePath="..\libsrc\include\meshing.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\include\meshing.hpp"
|
||||
RelativePath="..\libsrc\meshing\meshing.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -986,11 +1154,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\general\myadt.hpp"
|
||||
RelativePath="..\libsrc\include\myadt.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\include\myadt.hpp"
|
||||
RelativePath="..\libsrc\general\myadt.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1022,11 +1190,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\linalg\opti.hpp"
|
||||
RelativePath="..\libsrc\include\opti.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\libsrc\include\opti.hpp"
|
||||
RelativePath="..\libsrc\linalg\opti.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
||||
@ -13,8 +13,9 @@ if [%1]==[] goto InputParamsFailed
|
||||
set PROJ_NAME=%~1
|
||||
set PROJ_EXEC=%~2
|
||||
set BUILD_TYPE=%~3
|
||||
set PROJ_DIR=%~4
|
||||
set LIB_NAME=%~5
|
||||
set BUILD_ARCH=%~4
|
||||
set PROJ_DIR=%~5
|
||||
set LIB_NAME=%~6
|
||||
|
||||
REM *** Change these Folders if required ***
|
||||
REM Check if the environment variable NETGENDIR exists,
|
||||
@ -24,7 +25,7 @@ if defined NETGENDIR (
|
||||
set INSTALL_FOLDER=%NETGENDIR%\..
|
||||
) else (
|
||||
echo Environment variable NETGENDIR not found.... using default location!!!
|
||||
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst
|
||||
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst_%BUILD_ARCH%
|
||||
)
|
||||
|
||||
set NETGEN_TCLSRC=%PROJ_DIR%..\ng
|
||||
@ -53,14 +54,26 @@ REM echo Installing auxiliary TCL Files: Completed OK!!
|
||||
|
||||
REM *** Copy the primary Netgen executable file into the Install Folder ***
|
||||
echo Installing %PROJ_EXEC% into %INSTALL_FOLDER%\bin ....
|
||||
if /i "%BUILD_ARCH%" == "win32" (
|
||||
xcopy "%PROJ_DIR%%BUILD_TYPE%\%PROJ_EXEC%" "%INSTALL_FOLDER%\bin\" /i /d /y
|
||||
if errorlevel 1 goto ExecInstallFailed
|
||||
)
|
||||
if /i "%BUILD_ARCH%" == "x64" (
|
||||
xcopy "%PROJ_DIR%%BUILD_ARCH%\%BUILD_TYPE%\%PROJ_EXEC%" "%INSTALL_FOLDER%\bin\" /i /d /y
|
||||
if errorlevel 1 goto ExecInstallFailed
|
||||
)
|
||||
echo Installing %PROJ_EXEC%: Completed OK!!
|
||||
|
||||
REM *** Copy the primary Netgen library and include files into the Install Folder ***
|
||||
echo Installing %LIB_NAME%.lib into %INSTALL_FOLDER%\lib ....
|
||||
if /i "%BUILD_ARCH%" == "win32" (
|
||||
xcopy "%PROJ_DIR%%BUILD_TYPE%\%LIB_NAME%.lib" "%INSTALL_FOLDER%\lib\" /i /d /y
|
||||
if errorlevel 1 goto LibInstallFailed
|
||||
)
|
||||
if /i "%BUILD_ARCH%" == "x64" (
|
||||
xcopy "%PROJ_DIR%%BUILD_ARCH%\%BUILD_TYPE%\%LIB_NAME%.lib" "%INSTALL_FOLDER%\lib\" /i /d /y
|
||||
if errorlevel 1 goto LibInstallFailed
|
||||
)
|
||||
echo Installing %LIB_NAME%.lib: Completed OK!!
|
||||
|
||||
echo Installing %LIB_NAME%.h into %INSTALL_FOLDER%\include ....
|
||||
|
||||
@ -13,7 +13,8 @@ if [%1]==[] goto InputParamsFailed
|
||||
set PROJ_NAME=%~1
|
||||
set PROJ_EXEC=%~2
|
||||
set BUILD_TYPE=%~3
|
||||
set PROJ_DIR=%~4
|
||||
set BUILD_ARCH=%~4
|
||||
set PROJ_DIR=%~5
|
||||
|
||||
REM *** Change these Folders if required ***
|
||||
REM Check if the environment variable NETGENDIR exists,
|
||||
@ -23,7 +24,7 @@ if defined NETGENDIR (
|
||||
set INSTALL_FOLDER=%NETGENDIR%\..
|
||||
) else (
|
||||
echo Environment variable NETGENDIR not found.... using default location!!!
|
||||
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst
|
||||
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst_%BUILD_ARCH%
|
||||
)
|
||||
|
||||
set NGLIB_LIBINC=%PROJ_DIR%..\nglib
|
||||
@ -39,12 +40,24 @@ REM echo Embedding Manifest into the DLL: Completed OK!!
|
||||
|
||||
REM *** Copy the DLL and LIB Files into the install folder ***
|
||||
echo Installing required files into %INSTALL_FOLDER% ....
|
||||
if /i "%BUILD_ARCH%" == "win32" (
|
||||
xcopy "%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_EXEC%" "%INSTALL_FOLDER%\bin\" /i /d /y
|
||||
if errorlevel 1 goto DLLInstallFailed
|
||||
)
|
||||
if /i "%BUILD_ARCH%" == "x64" (
|
||||
xcopy "%PROJ_DIR%%PROJ_NAME%\%BUILD_ARCH%\%BUILD_TYPE%\%PROJ_EXEC%" "%INSTALL_FOLDER%\bin\" /i /d /y
|
||||
if errorlevel 1 goto DLLInstallFailed
|
||||
)
|
||||
echo Installing %PROJ_EXEC%: Completed OK!!
|
||||
|
||||
if /i "%BUILD_ARCH%" == "win32" (
|
||||
xcopy "%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_NAME%.lib" "%INSTALL_FOLDER%\lib\" /i /d /y
|
||||
if errorlevel 1 goto LibInstallFailed
|
||||
)
|
||||
if /i "%BUILD_ARCH%" == "x64" (
|
||||
xcopy "%PROJ_DIR%%PROJ_NAME%\%BUILD_ARCH%\%BUILD_TYPE%\%PROJ_NAME%.lib" "%INSTALL_FOLDER%\lib\" /i /d /y
|
||||
if errorlevel 1 goto LibInstallFailed
|
||||
)
|
||||
echo Installing %PROJ_NAME%.lib: Completed OK!!
|
||||
|
||||
REM *** Copy the include file nglib.h into the install folder ***
|
||||
|
||||
Loading…
Reference in New Issue
Block a user