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

* Modified manifest generation and embedding methods to allow Netgen to run on Vista

Browse Source 
* the post build scripts no longer need to embed the manifests manually
This commit is contained in:
Philippose Rajan 2009-07-25 18:28:00 +00:00
parent 017b0ca911
commit cf72c33585
4 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
windows/netgen.vcproj
View File

@ -70,12 +70,12 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib"" AdditionalLibraryDirectories=""$(SolutionDir)..\..\ext_libs\tcl\lib";"$(SolutionDir)..\..\ext_libs\pthread-w32\lib""
GenerateManifest="true" GenerateManifest="true"
EnableUAC="false" EnableUAC="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -157,7 +157,7 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;"
GenerateManifest="true" GenerateManifest="true"
EnableUAC="false" EnableUAC="true"
GenerateDebugInformation="false" GenerateDebugInformation="false"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"
@ -165,7 +165,7 @@
OptimizeForWindows98="0" OptimizeForWindows98="0"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -247,7 +247,7 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
GenerateManifest="true" GenerateManifest="true"
EnableUAC="false" EnableUAC="true"
EmbedManagedResourceFile="" EmbedManagedResourceFile=""
GenerateDebugInformation="false" GenerateDebugInformation="false"
SubSystem="1" SubSystem="1"
@ -256,7 +256,7 @@
OptimizeForWindows98="0" OptimizeForWindows98="0"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -336,12 +336,12 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
GenerateManifest="true" GenerateManifest="true"
EnableUAC="false" EnableUAC="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -437,11 +437,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\csg.hpp" RelativePath="..\libsrc\csg\csg.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\csg\csg.hpp" RelativePath="..\libsrc\include\csg.hpp"
> >
</File> </File>
<File <File
@ -557,11 +557,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\gprim\gprim.hpp" RelativePath="..\libsrc\include\gprim.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\gprim.hpp" RelativePath="..\libsrc\gprim\gprim.hpp"
> >
</File> </File>
<File <File
@ -617,11 +617,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\linalg\linalg.hpp" RelativePath="..\libsrc\include\linalg.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\linalg.hpp" RelativePath="..\libsrc\linalg\linalg.hpp"
> >
</File> </File>
<File <File
@ -645,11 +645,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\meshing.hpp" RelativePath="..\libsrc\meshing\meshing.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\meshing\meshing.hpp" RelativePath="..\libsrc\include\meshing.hpp"
> >
</File> </File>
<File <File
@ -733,11 +733,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\occgeom.hpp" RelativePath="..\libsrc\occ\occgeom.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\occ\occgeom.hpp" RelativePath="..\libsrc\include\occgeom.hpp"
> >
</File> </File>
<File <File
@ -745,11 +745,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
@ -857,11 +857,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\stlgeom\stlgeom.hpp" RelativePath="..\libsrc\include\stlgeom.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\stlgeom.hpp" RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
> >
</File> </File>
<File <File
@ -925,11 +925,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\visual.hpp" RelativePath="..\libsrc\visualization\visual.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\visualization\visual.hpp" RelativePath="..\libsrc\include\visual.hpp"
> >
</File> </File>
<File <File

28
windows/netgen_MSVC2005.vcproj
View File

@ -42,13 +42,13 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OPENGL;WINVER=0x0501;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
@ -68,11 +68,12 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;"
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -130,13 +131,13 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32;MSVC_EXPRESS;OPENGL;WINVER=0x0501;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32;MSVC_EXPRESS;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="2" WarningLevel="2"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
@ -156,6 +157,7 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;"
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true"
GenerateDebugInformation="false" GenerateDebugInformation="false"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"
@ -163,7 +165,7 @@
OptimizeForWindows98="0" OptimizeForWindows98="0"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -221,13 +223,13 @@
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(CASROOT)\inc&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(CASROOT)\inc&quot;"
PreprocessorDefinitions="WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;OCCGEOMETRY;OPENGL;WINVER=0x0501;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;OCCGEOMETRY;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="2" WarningLevel="2"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
@ -248,6 +250,7 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true"
EmbedManagedResourceFile="" EmbedManagedResourceFile=""
GenerateDebugInformation="false" GenerateDebugInformation="false"
SubSystem="1" SubSystem="1"
@ -256,7 +259,7 @@
OptimizeForWindows98="0" OptimizeForWindows98="0"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -312,13 +315,13 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(CASROOT)\inc&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;$(SolutionDir)..\ng&quot;;&quot;$(SolutionDir)..\libsrc\include&quot;;&quot;$(SolutionDir)..\libsrc\interface&quot;;&quot;$(SolutionDir)..\..\ext_libs\tcl\include&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\include&quot;;&quot;$(CASROOT)\inc&quot;"
PreprocessorDefinitions="WIN32;WNT;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OCCGEOMETRY;OPENGL;WINVER=0x0501;NGINTERFACE_EXPORTS" PreprocessorDefinitions="WIN32;WNT;_DEBUG;_CONSOLE;DEBUG;MSVC_EXPRESS;OCCGEOMETRY;OPENGL;WINVER=0x0600;NTDDI_VERSION=NTDDI_VISTA;NGINTERFACE_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
@ -338,11 +341,12 @@
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
GenerateManifest="true" GenerateManifest="true"
EnableUAC="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
ImportLibrary="$(OutDir)\nginterface.lib" ImportLibrary="$(OutDir)\nginterface.lib"
TargetMachine="1" TargetMachine="1"
AllowIsolation="false" AllowIsolation="true"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
windows/postBuild_netgen.bat
View File

@ -35,10 +35,10 @@ REM *** Start the Installation procedure ***
echo POSTBUILD Script for %PROJ_NAME% ........ echo POSTBUILD Script for %PROJ_NAME% ........
REM *** Embed the Windows Manifest into the Executable File *** REM *** Embed the Windows Manifest into the Executable File ***
echo Embedding Manifest into the executable: %PROJ_EXEC% .... REM echo Embedding Manifest into the executable: %PROJ_EXEC% ....
mt.exe -manifest "%BUILD_TYPE%\%PROJ_EXEC%.intermediate.manifest" "-outputresource:%BUILD_TYPE%\%PROJ_EXEC%;#1" REM mt.exe -manifest "%BUILD_TYPE%\%PROJ_EXEC%.intermediate.manifest" "-outputresource:%BUILD_TYPE%\%PROJ_EXEC%;#1"
if errorlevel 1 goto ManifestFailed REM if errorlevel 1 goto ManifestFailed
echo Embedding Manifest into the executable: Completed OK!! REM echo Embedding Manifest into the executable: Completed OK!!
REM *** Copy the core TCL files into the Install Folder *** REM *** Copy the core TCL files into the Install Folder ***
echo Installing core TCL files into %INSTALL_FOLDER%\bin .... echo Installing core TCL files into %INSTALL_FOLDER%\bin ....

8
windows/postBuild_nglib.bat
View File

@ -32,10 +32,10 @@ set NGLIB_LIBINC=%PROJ_DIR%..\nglib
echo POSTBUILD Script for %PROJ_NAME% ........ echo POSTBUILD Script for %PROJ_NAME% ........
REM *** Embed the Windows Manifest into the Executable File *** REM *** Embed the Windows Manifest into the Executable File ***
echo Embedding Manifest into the DLL: %PROJ_EXEC% .... REM echo Embedding Manifest into the DLL: %PROJ_EXEC% ....
mt.exe -manifest "%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_EXEC%.intermediate.manifest" "-outputresource:%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_EXEC%;#2" REM mt.exe -manifest "%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_EXEC%.intermediate.manifest" "-outputresource:%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_EXEC%;#2"
if errorlevel 1 goto ManifestFailed REM if errorlevel 1 goto ManifestFailed
echo Embedding Manifest into the DLL: Completed OK!! REM echo Embedding Manifest into the DLL: Completed OK!!
REM *** Copy the DLL and LIB Files into the install folder *** REM *** Copy the DLL and LIB Files into the install folder ***
echo Installing required files into %INSTALL_FOLDER% .... echo Installing required files into %INSTALL_FOLDER% ....