From cf72c33585b83dc05397541047a5f11ba40b9cb9 Mon Sep 17 00:00:00 2001
From: Philippose Rajan <philippose>
Date: Sat, 25 Jul 2009 18:28:00 +0000
Subject: [PATCH] * Modified manifest generation and embedding methods to allow
 Netgen to run on Vista * the post build scripts no longer need to embed the
 manifests manually

---
 windows/netgen.vcproj          | 48 +++++++++++++++++-----------------
 windows/netgen_MSVC2005.vcproj | 28 +++++++++++---------
 windows/postBuild_netgen.bat   |  8 +++---
 windows/postBuild_nglib.bat    |  8 +++---
 4 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/windows/netgen.vcproj b/windows/netgen.vcproj
index 4aab0caa..468d6379 100644
--- a/windows/netgen.vcproj
+++ b/windows/netgen.vcproj
@@ -70,12 +70,12 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;"
 				GenerateManifest="true"
-				EnableUAC="false"
+				EnableUAC="true"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -157,7 +157,7 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;"
 				GenerateManifest="true"
-				EnableUAC="false"
+				EnableUAC="true"
 				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -165,7 +165,7 @@
 				OptimizeForWindows98="0"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -247,7 +247,7 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
 				GenerateManifest="true"
-				EnableUAC="false"
+				EnableUAC="true"
 				EmbedManagedResourceFile=""
 				GenerateDebugInformation="false"
 				SubSystem="1"
@@ -256,7 +256,7 @@
 				OptimizeForWindows98="0"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -336,12 +336,12 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
 				GenerateManifest="true"
-				EnableUAC="false"
+				EnableUAC="true"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -437,11 +437,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\csg.hpp"
+				RelativePath="..\libsrc\csg\csg.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\csg\csg.hpp"
+				RelativePath="..\libsrc\include\csg.hpp"
 				>
 			</File>
 			<File
@@ -557,11 +557,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
@@ -617,11 +617,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\linalg\linalg.hpp"
+				RelativePath="..\libsrc\include\linalg.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\linalg.hpp"
+				RelativePath="..\libsrc\linalg\linalg.hpp"
 				>
 			</File>
 			<File
@@ -645,11 +645,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\meshing.hpp"
+				RelativePath="..\libsrc\meshing\meshing.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\meshing\meshing.hpp"
+				RelativePath="..\libsrc\include\meshing.hpp"
 				>
 			</File>
 			<File
@@ -733,11 +733,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\occgeom.hpp"
+				RelativePath="..\libsrc\occ\occgeom.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\occ\occgeom.hpp"
+				RelativePath="..\libsrc\include\occgeom.hpp"
 				>
 			</File>
 			<File
@@ -745,11 +745,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
@@ -857,11 +857,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
+				RelativePath="..\libsrc\include\stlgeom.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\stlgeom.hpp"
+				RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
 				>
 			</File>
 			<File
@@ -925,11 +925,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\visual.hpp"
+				RelativePath="..\libsrc\visualization\visual.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\visualization\visual.hpp"
+				RelativePath="..\libsrc\include\visual.hpp"
 				>
 			</File>
 			<File
diff --git a/windows/netgen_MSVC2005.vcproj b/windows/netgen_MSVC2005.vcproj
index 7cf49b35..4616ece0 100644
--- a/windows/netgen_MSVC2005.vcproj
+++ b/windows/netgen_MSVC2005.vcproj
@@ -42,13 +42,13 @@
 				Name="VCCLCompilerTool"
 				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;"
-				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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -68,11 +68,12 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;"
 				GenerateManifest="true"
+				EnableUAC="true"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -130,13 +131,13 @@
 				InlineFunctionExpansion="2"
 				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;"
-				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"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -156,6 +157,7 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;"
 				GenerateManifest="true"
+				EnableUAC="true"
 				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -163,7 +165,7 @@
 				OptimizeForWindows98="0"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -221,13 +223,13 @@
 				InlineFunctionExpansion="2"
 				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;"
-				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"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -248,6 +250,7 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
 				GenerateManifest="true"
+				EnableUAC="true"
 				EmbedManagedResourceFile=""
 				GenerateDebugInformation="false"
 				SubSystem="1"
@@ -256,7 +259,7 @@
 				OptimizeForWindows98="0"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -312,13 +315,13 @@
 				Name="VCCLCompilerTool"
 				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;"
-				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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -338,11 +341,12 @@
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)..\..\ext_libs\tcl\lib&quot;;&quot;$(SolutionDir)..\..\ext_libs\pthread-w32\lib&quot;;&quot;$(CASROOT)\win32\lib&quot;"
 				GenerateManifest="true"
+				EnableUAC="true"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				ImportLibrary="$(OutDir)\nginterface.lib"
 				TargetMachine="1"
-				AllowIsolation="false"
+				AllowIsolation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/windows/postBuild_netgen.bat b/windows/postBuild_netgen.bat
index 398b9671..d54d041b 100644
--- a/windows/postBuild_netgen.bat
+++ b/windows/postBuild_netgen.bat
@@ -35,10 +35,10 @@ REM *** Start the Installation procedure ***
 echo POSTBUILD Script for %PROJ_NAME% ........
 
 REM *** Embed the Windows Manifest into the Executable File ***
-echo Embedding Manifest into the executable: %PROJ_EXEC% ....
-mt.exe -manifest "%BUILD_TYPE%\%PROJ_EXEC%.intermediate.manifest" "-outputresource:%BUILD_TYPE%\%PROJ_EXEC%;#1" 
-if errorlevel 1 goto ManifestFailed
-echo Embedding Manifest into the executable: Completed OK!!
+REM echo Embedding Manifest into the executable: %PROJ_EXEC% ....
+REM mt.exe -manifest "%BUILD_TYPE%\%PROJ_EXEC%.intermediate.manifest" "-outputresource:%BUILD_TYPE%\%PROJ_EXEC%;#1" 
+REM if errorlevel 1 goto ManifestFailed
+REM echo Embedding Manifest into the executable: Completed OK!!
 
 REM *** Copy the core TCL files into the Install Folder ***
 echo Installing core TCL files into %INSTALL_FOLDER%\bin ....
diff --git a/windows/postBuild_nglib.bat b/windows/postBuild_nglib.bat
index 4eadce20..4c96b4ba 100644
--- a/windows/postBuild_nglib.bat
+++ b/windows/postBuild_nglib.bat
@@ -32,10 +32,10 @@ set NGLIB_LIBINC=%PROJ_DIR%..\nglib
 echo POSTBUILD Script for %PROJ_NAME% ........
 
 REM *** Embed the Windows Manifest into the Executable File ***
-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" 
-if errorlevel 1 goto ManifestFailed
-echo Embedding Manifest into the DLL: Completed OK!!
+REM echo Embedding Manifest into the DLL: %PROJ_EXEC% ....
+REM mt.exe -manifest "%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_EXEC%.intermediate.manifest" "-outputresource:%PROJ_DIR%%PROJ_NAME%\%BUILD_TYPE%\%PROJ_EXEC%;#2" 
+REM if errorlevel 1 goto ManifestFailed
+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% ....