From 5c6208fb817370e2bc03c4ac5be662ebbea24bdd Mon Sep 17 00:00:00 2001
From: Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>
Date: Wed, 31 Aug 2011 17:29:14 +0000
Subject: [PATCH]

---
 windows/netgen-4.9.14.sln    | 16 ---------
 windows/netgen-4.9.14.vcproj | 66 ++++++++++++++++++++++++------------
 windows/nglib.vcproj         | 16 ++++++---
 3 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/windows/netgen-4.9.14.sln b/windows/netgen-4.9.14.sln
index 6db0d8e9..349f56d3 100644
--- a/windows/netgen-4.9.14.sln
+++ b/windows/netgen-4.9.14.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netgen", "netgen-4.9.14.vcproj", "{87468946-A594-4101-81A4-A131F35261EF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geom2d", "geom2d.vcproj", "{D9FE218C-E915-4F94-A667-763EA182ABD5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug(OCC)|Win32 = Debug(OCC)|Win32
@@ -33,20 +31,6 @@ Global
 		{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
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug(OCC)|Win32.ActiveCfg = Debug|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug(OCC)|x64.ActiveCfg = Debug|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug(OCC)|x64.Build.0 = Debug|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|Win32.Build.0 = Debug|Win32
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|x64.ActiveCfg = Debug|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Debug|x64.Build.0 = Debug|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Release(OCC)|Win32.ActiveCfg = Release|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Release(OCC)|x64.ActiveCfg = Release|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Release(OCC)|x64.Build.0 = Release|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|Win32.ActiveCfg = Release|Win32
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|Win32.Build.0 = Release|Win32
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|x64.ActiveCfg = Release|x64
-		{D9FE218C-E915-4F94-A667-763EA182ABD5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/windows/netgen-4.9.14.vcproj b/windows/netgen-4.9.14.vcproj
index 9d604aed..c45937f6 100644
--- a/windows/netgen-4.9.14.vcproj
+++ b/windows/netgen-4.9.14.vcproj
@@ -944,11 +944,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\gprim.hpp"
+				RelativePath="..\libsrc\gprim\gprim.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\gprim\gprim.hpp"
+				RelativePath="..\libsrc\include\gprim.hpp"
 				>
 			</File>
 			<File
@@ -1004,11 +1004,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
@@ -1032,11 +1032,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
@@ -1076,11 +1076,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\myadt.hpp"
+				RelativePath="..\libsrc\general\myadt.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\general\myadt.hpp"
+				RelativePath="..\libsrc\include\myadt.hpp"
 				>
 			</File>
 			<File
@@ -1116,11 +1116,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\occ\occgeom.hpp"
+				RelativePath="..\libsrc\include\occgeom.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\occgeom.hpp"
+				RelativePath="..\libsrc\occ\occgeom.hpp"
 				>
 			</File>
 			<File
@@ -1128,11 +1128,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\opti.hpp"
+				RelativePath="..\libsrc\linalg\opti.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\linalg\opti.hpp"
+				RelativePath="..\libsrc\include\opti.hpp"
 				>
 			</File>
 			<File
@@ -1220,11 +1220,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\geom2d\spline.hpp"
+				RelativePath="..\libsrc\gprim\spline.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\gprim\spline.hpp"
+				RelativePath="..\libsrc\geom2d\spline.hpp"
 				>
 			</File>
 			<File
@@ -1236,11 +1236,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\geom2d\splinegeometry.hpp"
+				RelativePath="..\libsrc\gprim\splinegeometry.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\gprim\splinegeometry.hpp"
+				RelativePath="..\libsrc\geom2d\splinegeometry.hpp"
 				>
 			</File>
 			<File
@@ -1252,11 +1252,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\include\stlgeom.hpp"
+				RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
+				RelativePath="..\libsrc\include\stlgeom.hpp"
 				>
 			</File>
 			<File
@@ -1319,12 +1319,16 @@
 				RelativePath="..\libsrc\visualization\vispar.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\libsrc\visualization\visual.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\libsrc\include\visual.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\visualization\visual.hpp"
+				RelativePath="..\libsrc\geom2d\vsgeom2d.hpp"
 				>
 			</File>
 			<File
@@ -1489,14 +1493,30 @@
 				RelativePath="..\libsrc\csg\genmesh.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\libsrc\geom2d\genmesh2d.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\libsrc\gprim\geom2d.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\libsrc\geom2d\geom2dmesh.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\libsrc\geom2d\geom2dpkg.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\libsrc\gprim\geom3d.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\libsrc\geom2d\geometry2d.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\libsrc\gprim\geomfuncs.cpp"
 				>
@@ -1626,11 +1646,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\ng\nginterface.cpp"
+				RelativePath="..\libsrc\interface\nginterface.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\ng\nginterface_v2.cpp"
+				RelativePath="..\libsrc\interface\nginterface_v2.cpp"
 				>
 			</File>
 			<File
@@ -1873,6 +1893,10 @@
 				RelativePath="..\libsrc\visualization\vsfieldlines.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\libsrc\geom2d\vsgeom2d.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\libsrc\visualization\vsmesh.cpp"
 				>
diff --git a/windows/nglib.vcproj b/windows/nglib.vcproj
index 0569e394..844f64b7 100644
--- a/windows/nglib.vcproj
+++ b/windows/nglib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="nglib"
 	ProjectGUID="{2E260C8C-595C-442A-A962-51AC06EF8143}"
 	RootNamespace="nglib"
@@ -294,7 +294,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				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;_WIN32_WINNT=0x0502"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;_WIN32_WINNT=0x0502;NOTCL"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="1"
@@ -647,6 +647,10 @@
 				RelativePath="..\libsrc\gprim\geom3d.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\libsrc\geom2d\geometry2d.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\libsrc\gprim\geomfuncs.cpp"
 				>
@@ -759,6 +763,10 @@
 				RelativePath="..\libsrc\general\ngexception.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\libsrc\interface\nginterface.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\nglib\nglib.cpp"
 				>
@@ -900,7 +908,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\geom2d\spline.cpp"
+				RelativePath="..\libsrc\gprim\spline.cpp"
 				>
 			</File>
 			<File
@@ -908,7 +916,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libsrc\geom2d\splinegeometry.cpp"
+				RelativePath="..\libsrc\gprim\splinegeometry.cpp"
 				>
 			</File>
 			<File