Merge pull request #115 from WeixiaoGao/visual-studio

update visual studio files
tudelft3d · Nov 26, 2017 · 7989e96 · 7989e96
2 parents 2a47786 + ba857f7
commit 7989e96
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 122 deletions.
diff --git a/vs_build/val3dity.sln b/vs_build/val3dity.sln
@@ -1,26 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "val3dity", "val3dity.vcxproj", "{EC12993E-689D-496D-BF7E-8D491ED1F413}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assimp", "..\..\assimp-3.2\vs_build\assimp.vcxproj", "{7A042954-9C47-38B3-BDAD-E2E0A56616EB}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Debug|Win32.Build.0 = Debug|Win32
 		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Debug|x64.ActiveCfg = Debug|x64
 		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Debug|x64.Build.0 = Debug|x64
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Debug|x86.ActiveCfg = Debug|Win32
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Debug|x86.Build.0 = Debug|Win32
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Release|Win32.ActiveCfg = Release|Win32
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Release|Win32.Build.0 = Release|Win32
 		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Release|x64.ActiveCfg = Release|x64
 		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Release|x64.Build.0 = Release|x64
-		{7A042954-9C47-38B3-BDAD-E2E0A56616EB}.Debug|x64.ActiveCfg = Debug|x64
-		{7A042954-9C47-38B3-BDAD-E2E0A56616EB}.Debug|x64.Build.0 = Debug|x64
-		{7A042954-9C47-38B3-BDAD-E2E0A56616EB}.Release|x64.ActiveCfg = Release|x64
-		{7A042954-9C47-38B3-BDAD-E2E0A56616EB}.Release|x64.Build.0 = Release|x64
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Release|x86.ActiveCfg = Release|Win32
+		{EC12993E-689D-496D-BF7E-8D491ED1F413}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/vs_build/val3dity.vcxproj b/vs_build/val3dity.vcxproj
@@ -66,6 +66,10 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <ExecutablePath>$(QTDIR)\5.6\msvc2013\bin;$(CGAL_DIR)\auxiliary\gmp\lib;$(CGAL_DIR)\bin;$(CGAL_DIR)\build\bin;C:\OSGeo4W\bin;D:\CGAL-4.11\vs2015\bin;C:\boost\boost_1_66_0_vs2015\lib32-msvc-14.0;$(ExecutablePath)</ExecutablePath>
+    <IncludePath>D:\CGAL-4.11\auxiliary\gmp\include;D:\CGAL-4.11\include;D:\CGAL-4.11\vs2015\include;C:\boost\boost_1_66_0_vs2015;C:\Program Files\opencv\build\include;C:\Program Files\opencv\build\include\opencv;C:\Program Files\opencv\build\include\opencv2;C:\OSGeo4W\include;D:\Qt\Qt5.6.3\5.6.3\msvc2015\include;D:\Qt\Qt5.6.3\5.6.3\msvc2015;D:\data\3dgeoinfo\val3dity-master3;D:\CGAL-4.11\vs2015\bin;C:\OSGeo4W\bin;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\boost\boost_1_66_0_vs2015\libs;D:\CGAL-4.11\vs2015\lib;C:\boost\boost_1_66_0_vs2015\lib32-msvc-14.0;D:\Qt\Qt5.6.3\5.6.3\msvc2015\lib;C:\Program Files\opencv\build\x64\vc12\bin;C:\Program Files\opencv\build\x64\vc12\lib;C:\Program Files\opencv\build\x64\vc12\staticlib;C:\Program Files\opencv\build\x64\vc11\bin;C:\Program Files\opencv\build\x64\vc11\lib;C:\Program Files\opencv\build\x64\vc11\staticlib;C:\OSGeo4W\lib;$(LibraryPath)</LibraryPath>
+    <ReferencePath>$(ReferencePath)</ReferencePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -88,14 +92,16 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\include;..\..\boost_1_60_0;..\..\CGAL-4.8\include;..\..\CGAL-4.8\bin\include;..\..\CGAL-4.8\auxiliary\gmp\include;..\..\assimp-3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\boost\boost_1_66_0_vs2015;D:\CGAL-4.11\include;D:\CGAL-4.11\vs2015\include;D:\CGAL-4.11\auxiliary\gmp\include;C:\OSGeo4W\bin;D:\CGAL-4.11\vs2015\bin</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>C:\OSGeo4W\lib;D:\CGAL-4.11\vs2015\lib\Release;D:\CGAL-4.11\auxiliary\gmp\lib\;D:\openexrm\zlib\zlib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libgmp-10.lib;libmpfr-4.lib;geos_c.lib;CGAL_Core-vc140-mt-4.11.lib;CGAL-vc140-mt-4.11.lib;zlibd.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -119,54 +125,53 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\geomtools.cpp" />
-    <ClCompile Include="..\input.cpp" />
-    <ClCompile Include="..\main.cpp" />
-    <ClCompile Include="..\pugixml.cpp" />
-    <ClCompile Include="..\Shell.cpp" />
-    <ClCompile Include="..\Solid.cpp" />
-    <ClCompile Include="..\validate_shell.cpp" />
-    <ClCompile Include="..\validate_shell_intersection.cpp" />
+    <ClInclude Include="..\thirdparty\nlohmann-json\json.hpp" />
+    <ClInclude Include="..\thirdparty\pugixml\pugiconfig.hpp" />
+    <ClInclude Include="..\thirdparty\pugixml\pugixml.hpp" />
+    <ClInclude Include="..\thirdparty\tclap\Arg.h" />
+    <ClInclude Include="..\thirdparty\tclap\ArgException.h" />
+    <ClInclude Include="..\thirdparty\tclap\ArgTraits.h" />
+    <ClInclude Include="..\thirdparty\tclap\CmdLine.h" />
+    <ClInclude Include="..\thirdparty\tclap\CmdLineInterface.h" />
+    <ClInclude Include="..\thirdparty\tclap\CmdLineOutput.h" />
+    <ClInclude Include="..\thirdparty\tclap\Constraint.h" />
+    <ClInclude Include="..\thirdparty\tclap\DocBookOutput.h" />
+    <ClInclude Include="..\thirdparty\tclap\HelpVisitor.h" />
+    <ClInclude Include="..\thirdparty\tclap\IgnoreRestVisitor.h" />
+    <ClInclude Include="..\thirdparty\tclap\MultiArg.h" />
+    <ClInclude Include="..\thirdparty\tclap\MultiSwitchArg.h" />
+    <ClInclude Include="..\thirdparty\tclap\OptionalUnlabeledTracker.h" />
+    <ClInclude Include="..\thirdparty\tclap\StandardTraits.h" />
+    <ClInclude Include="..\thirdparty\tclap\StdOutput.h" />
+    <ClInclude Include="..\thirdparty\tclap\SwitchArg.h" />
+    <ClInclude Include="..\thirdparty\tclap\UnlabeledMultiArg.h" />
+    <ClInclude Include="..\thirdparty\tclap\UnlabeledValueArg.h" />
+    <ClInclude Include="..\thirdparty\tclap\ValueArg.h" />
+    <ClInclude Include="..\thirdparty\tclap\ValuesConstraint.h" />
+    <ClInclude Include="..\thirdparty\tclap\VersionVisitor.h" />
+    <ClInclude Include="..\thirdparty\tclap\Visitor.h" />
+    <ClInclude Include="..\thirdparty\tclap\XorHandler.h" />
+    <ClInclude Include="..\thirdparty\tclap\ZshCompletionOutput.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\definitions.h" />
-    <ClInclude Include="..\geomtools.h" />
-    <ClInclude Include="..\include\tclap\Arg.h" />
-    <ClInclude Include="..\include\tclap\ArgException.h" />
-    <ClInclude Include="..\include\tclap\ArgTraits.h" />
-    <ClInclude Include="..\include\tclap\CmdLine.h" />
-    <ClInclude Include="..\include\tclap\CmdLineInterface.h" />
-    <ClInclude Include="..\include\tclap\CmdLineOutput.h" />
-    <ClInclude Include="..\include\tclap\Constraint.h" />
-    <ClInclude Include="..\include\tclap\DocBookOutput.h" />
-    <ClInclude Include="..\include\tclap\HelpVisitor.h" />
-    <ClInclude Include="..\include\tclap\IgnoreRestVisitor.h" />
-    <ClInclude Include="..\include\tclap\MultiArg.h" />
-    <ClInclude Include="..\include\tclap\MultiSwitchArg.h" />
-    <ClInclude Include="..\include\tclap\OptionalUnlabeledTracker.h" />
-    <ClInclude Include="..\include\tclap\StandardTraits.h" />
-    <ClInclude Include="..\include\tclap\StdOutput.h" />
-    <ClInclude Include="..\include\tclap\SwitchArg.h" />
-    <ClInclude Include="..\include\tclap\UnlabeledMultiArg.h" />
-    <ClInclude Include="..\include\tclap\UnlabeledValueArg.h" />
-    <ClInclude Include="..\include\tclap\ValueArg.h" />
-    <ClInclude Include="..\include\tclap\ValuesConstraint.h" />
-    <ClInclude Include="..\include\tclap\VersionVisitor.h" />
-    <ClInclude Include="..\include\tclap\Visitor.h" />
-    <ClInclude Include="..\include\tclap\XorHandler.h" />
-    <ClInclude Include="..\include\tclap\ZshCompletionOutput.h" />
-    <ClInclude Include="..\input.h" />
-    <ClInclude Include="..\pugiconfig.hpp" />
-    <ClInclude Include="..\pugixml.hpp" />
-    <ClInclude Include="..\Shell.h" />
-    <ClInclude Include="..\Solid.h" />
-    <ClInclude Include="..\validate_shell.h" />
-    <ClInclude Include="..\validate_shell_intersection.h" />
+    <ClCompile Include="..\src\COError.cpp" />
+    <ClCompile Include="..\src\CompositeSolid.cpp" />
+    <ClCompile Include="..\src\CompositeSurface.cpp" />
+    <ClCompile Include="..\src\geomtools.cpp" />
+    <ClCompile Include="..\src\input.cpp" />
+    <ClCompile Include="..\src\main.cpp" />
+    <ClCompile Include="..\src\MultiSolid.cpp" />
+    <ClCompile Include="..\src\MultiSurface.cpp" />
+    <ClCompile Include="..\src\Primitive.cpp" />
+    <ClCompile Include="..\src\Solid.cpp" />
+    <ClCompile Include="..\src\Surface.cpp" />
+    <ClCompile Include="..\src\validate_prim_toporel.cpp" />
+    <ClCompile Include="..\src\validate_shell.cpp" />
+    <ClCompile Include="..\thirdparty\pugixml\pugixml.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\assimp-3.2\vs_build\assimp.vcxproj">
-      <Project>{7a042954-9c47-38b3-bdad-e2e0a56616eb}</Project>
-    </ProjectReference>
+    <ResourceCompile Include="val3dity.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/vs_build/val3dity.vcxproj.filters b/vs_build/val3dity.vcxproj.filters
@@ -15,130 +15,138 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\geomtools.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\input.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\pugixml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Shell.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Solid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\validate_shell.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\validate_shell_intersection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\definitions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\geomtools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\input.h">
+    <ClInclude Include="..\thirdparty\tclap\Arg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Shell.h">
+    <ClInclude Include="..\thirdparty\tclap\ArgException.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Solid.h">
+    <ClInclude Include="..\thirdparty\tclap\ArgTraits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\validate_shell.h">
+    <ClInclude Include="..\thirdparty\tclap\CmdLine.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\validate_shell_intersection.h">
+    <ClInclude Include="..\thirdparty\tclap\CmdLineInterface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\pugiconfig.hpp">
+    <ClInclude Include="..\thirdparty\tclap\CmdLineOutput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\pugixml.hpp">
+    <ClInclude Include="..\thirdparty\tclap\Constraint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\Arg.h">
+    <ClInclude Include="..\thirdparty\tclap\DocBookOutput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\ArgException.h">
+    <ClInclude Include="..\thirdparty\tclap\HelpVisitor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\ArgTraits.h">
+    <ClInclude Include="..\thirdparty\tclap\IgnoreRestVisitor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\CmdLine.h">
+    <ClInclude Include="..\thirdparty\tclap\MultiArg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\CmdLineInterface.h">
+    <ClInclude Include="..\thirdparty\tclap\MultiSwitchArg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\CmdLineOutput.h">
+    <ClInclude Include="..\thirdparty\tclap\OptionalUnlabeledTracker.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\Constraint.h">
+    <ClInclude Include="..\thirdparty\tclap\StandardTraits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\DocBookOutput.h">
+    <ClInclude Include="..\thirdparty\tclap\StdOutput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\HelpVisitor.h">
+    <ClInclude Include="..\thirdparty\tclap\SwitchArg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\IgnoreRestVisitor.h">
+    <ClInclude Include="..\thirdparty\tclap\UnlabeledMultiArg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\MultiArg.h">
+    <ClInclude Include="..\thirdparty\tclap\UnlabeledValueArg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\MultiSwitchArg.h">
+    <ClInclude Include="..\thirdparty\tclap\ValueArg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\OptionalUnlabeledTracker.h">
+    <ClInclude Include="..\thirdparty\tclap\ValuesConstraint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\StandardTraits.h">
+    <ClInclude Include="..\thirdparty\tclap\VersionVisitor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\StdOutput.h">
+    <ClInclude Include="..\thirdparty\tclap\Visitor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\SwitchArg.h">
+    <ClInclude Include="..\thirdparty\tclap\XorHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\UnlabeledMultiArg.h">
+    <ClInclude Include="..\thirdparty\tclap\ZshCompletionOutput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\UnlabeledValueArg.h">
+    <ClInclude Include="..\thirdparty\pugixml\pugiconfig.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\ValueArg.h">
+    <ClInclude Include="..\thirdparty\pugixml\pugixml.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\ValuesConstraint.h">
+    <ClInclude Include="..\thirdparty\nlohmann-json\json.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\tclap\VersionVisitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\tclap\Visitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\tclap\XorHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\tclap\ZshCompletionOutput.h">
+    <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\thirdparty\pugixml\pugixml.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\COError.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\CompositeSolid.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\CompositeSurface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\geomtools.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\input.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\MultiSolid.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\MultiSurface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Primitive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Solid.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Surface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\validate_prim_toporel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\validate_shell.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="val3dity.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>