Updated qhull.sln and *.vcproj for renamed libqhull and UsingLibQhull

vcproj/qhulllib.vcproj → vcproj/libqhull.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="qhulllib"
+	Name="libqhull"
 	ProjectGUID="{D1377F6B-7868-460C-9FC5-489C32A3D08F}"
 	RootNamespace="qhull"
 	>
@@ -16,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\tmp\qhulllib\Release"
-			IntermediateDirectory="..\tmp\qhulllib\Release"
+			OutputDirectory="..\tmp\libqhull\Release"
+			IntermediateDirectory="..\tmp\libqhull\Release"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -48,10 +48,10 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="..\tmp\qhulllib\Release/qhulllib.pch"
-				AssemblerListingLocation="..\tmp\qhulllib\Release/"
-				ObjectFile="..\tmp\qhulllib\Release/"
-				ProgramDataBaseFileName="..\tmp\qhulllib\Release/"
+				PrecompiledHeaderFile="..\tmp\libqhull\Release/libqhull.pch"
+				AssemblerListingLocation="..\tmp\libqhull\Release/"
+				ObjectFile="..\tmp\libqhull\Release/"
+				ProgramDataBaseFileName="..\tmp\libqhull\Release/"
 				WarningLevel="4"
 				WarnAsError="true"
 				SuppressStartupBanner="true"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\tmp\qhulllib\Release\qhull.lib"
+				OutputFile="..\tmp\libqhull\Release\qhull.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -93,8 +93,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\tmp\qhulllib\Debug"
-			IntermediateDirectory="..\tmp\qhulllib\Debug"
+			OutputDirectory="..\tmp\libqhull\Debug"
+			IntermediateDirectory="..\tmp\libqhull\Debug"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -125,10 +125,10 @@
 				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
 				RuntimeTypeInfo="false"
-				PrecompiledHeaderFile="..\tmp\qhulllib\Debug/qhulllib.pch"
-				AssemblerListingLocation="..\tmp\qhulllib\Debug/"
-				ObjectFile="..\tmp\qhulllib\Debug/"
-				ProgramDataBaseFileName="..\tmp\qhulllib\Debug/"
+				PrecompiledHeaderFile="..\tmp\libqhull\Debug/libqhull.pch"
+				AssemblerListingLocation="..\tmp\libqhull\Debug/"
+				ObjectFile="..\tmp\libqhull\Debug/"
+				ProgramDataBaseFileName="..\tmp\libqhull\Debug/"
 				WarningLevel="4"
 				WarnAsError="true"
 				SuppressStartupBanner="true"
@@ -149,7 +149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\tmp\qhulllib\Debug\qhull.lib"
+				OutputFile="..\tmp\libqhull\Debug\qhull.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -369,7 +369,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\qhulllib.c"
+				RelativePath="..\src\libqhull.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -510,7 +510,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\qhulllib.h"
+				RelativePath="..\src\libqhull.h"
 				>
 			</File>
 			<File
@@ -564,7 +564,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\html\qh-code.htm"
+				RelativePath="..\html\qh-in.htm"
 				DeploymentContent="true"
 				>
 			</File>

vcproj/qhull.sln

@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qhull", "qhull.vcproj", "{D
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qhulllib", "qhulllib.vcproj", "{D1377F6B-7868-460C-9FC5-489C32A3D08F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libqhull", "libqhull.vcproj", "{D1377F6B-7868-460C-9FC5-489C32A3D08F}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
@@ -44,6 +44,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "user_eg3", "user_eg3.vcproj
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qhulltest", "qhulltest.vcproj", "{AFDCA33D-3D74-3866-BAE1-97033FE213AA}"
+	GlobalSection(Qt) = preSolution
+		Integration = True
+	EndGlobalSection
 	ProjectSection(ProjectDependencies) = postProject
 		{83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49} = {83B9A40B-EA6E-4DD8-A9D5-D51FFA0B5F49}
 		{D1377F6B-7868-460C-9FC5-489C32A3D08F} = {D1377F6B-7868-460C-9FC5-489C32A3D08F}
@@ -67,6 +70,7 @@ Global
 		{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Debug|Win32.Build.0 = Debug|Win32
 		{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Any CPU.ActiveCfg = Release|Win32
 		{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{DEB5D824-712C-47C7-BE7E-E0A866373C26}.Release|Mixed Platforms.Build.0 = Release|Win32
@@ -106,6 +110,7 @@ Global
 		{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Debug|Win32.Build.0 = Debug|Win32
 		{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{B94D6587-1030-4EA0-8322-E9B2902A9AC4}.Release|Mixed Platforms.Build.0 = Release|Win32
@@ -125,10 +130,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		QtVersion = 4.5.3
-	EndGlobalSection
-	GlobalSection(Qt) = preSolution
-		Integration = True
-	EndGlobalSection
 EndGlobal

vcproj/qhull.vcproj

@@ -75,7 +75,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="&quot;..\tmp\qhulllib\Release\qhull.lib&quot;"
+				AdditionalOptions="&quot;..\tmp\libqhull\Release\qhull.lib&quot;"
 				OutputFile="..\qhull.exe"
 				LinkIncremental="0"
 			/>
@@ -161,7 +161,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="&quot;..\tmp\qhulllib\Debug\qhull.lib&quot;"
+				AdditionalOptions="&quot;..\tmp\libqhull\Debug\qhull.lib&quot;"
 				OutputFile="../qhull.exe"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -213,7 +213,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\qhulllib.h"
+				RelativePath="..\src\libqhull.h"
 				>
 			</File>
 			<File

vcproj/qhullcpp.vcproj

@@ -259,7 +259,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\cpp\UsingQhullLib.cpp"
+				RelativePath="..\cpp\UsingLibQhull.cpp"
 				>
 			</File>
 		</Filter>
@@ -320,7 +320,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\qhulllib.h"
+				RelativePath="..\src\libqhull.h"
 				>
 			</File>
 			<File
@@ -408,7 +408,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\cpp\UsingQhullLib.h"
+				RelativePath="..\cpp\UsingLibQhull.h"
 				>
 			</File>
 		</Filter>

vcproj/qhulltest.vcproj

@@ -78,7 +78,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD "
-				AdditionalDependencies="../tmp/qhullcpp/Debug/qhullcpp.lib ../tmp/qhulllib/Debug/qhull.lib $(QTDIR)\lib\QtTestd4.lib $(QTDIR)\lib\QtGuid4.lib $(QTDIR)\lib\QtCored4.lib"
+				AdditionalDependencies="../tmp/qhullcpp/Debug/qhullcpp.lib ../tmp/libqhull/Debug/qhull.lib $(QTDIR)\lib\QtTestd4.lib $(QTDIR)\lib\QtGuid4.lib $(QTDIR)\lib\QtCored4.lib"
 				OutputFile="..\qhulltest.exe"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="c:\Qt\4.5.2\lib"
@@ -283,7 +283,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\cpp\qhulltest\UsingQhullLib_test.cpp"
+				RelativePath="..\cpp\qhulltest\UsingLibQhull_test.cpp"
 				>
 			</File>
 		</Filter>
@@ -663,17 +663,17 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\tmp\moc\UsingQhullLib_test.moc"
+				RelativePath="..\tmp\moc\UsingLibQhull_test.moc"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing UsingQhullLib_test.cpp..."
-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;.\.&quot; -I&quot;.\..\cpp\.&quot; -I&quot;.\..\..\cpp\.&quot; -I&quot;.\..\src\.&quot; -I&quot;.\..\..\src\.&quot; -I&quot;.\..\tmp\.&quot; -I&quot;.\..\..\tmp\.&quot; -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;$(QTDIR)\include\QtTest\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;..\cpp\qhulltest\UsingQhullLib_test.cpp&quot; -o &quot;.\..\tmp\moc\UsingQhullLib_test.moc&quot;&#x0D;&#x0A;"
-						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;..\cpp\qhulltest\UsingQhullLib_test.cpp"
-						Outputs="&quot;.\..\tmp\moc\UsingQhullLib_test.moc&quot;"
+						Description="Moc&apos;ing UsingLibQhull_test.cpp..."
+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  -I&quot;.\.&quot; -I&quot;.\..\cpp\.&quot; -I&quot;.\..\..\cpp\.&quot; -I&quot;.\..\src\.&quot; -I&quot;.\..\..\src\.&quot; -I&quot;.\..\tmp\.&quot; -I&quot;.\..\..\tmp\.&quot; -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;$(QTDIR)\include\QtTest\.&quot; -I&quot;$(QTDIR)\include\ActiveQt\.&quot; -I&quot;$(QTDIR)\mkspecs\win32-msvc2005\.&quot; &quot;..\cpp\qhulltest\UsingLibQhull_test.cpp&quot; -o &quot;.\..\tmp\moc\UsingLibQhull_test.moc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;..\cpp\qhulltest\UsingLibQhull_test.cpp"
+						Outputs="&quot;.\..\tmp\moc\UsingLibQhull_test.moc&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration

vcproj/rbox.vcproj

@@ -75,7 +75,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="&quot;..\tmp\qhulllib\Release\qhull.lib&quot;"
+				AdditionalOptions="&quot;..\tmp\libqhull\Release\qhull.lib&quot;"
 				OutputFile="..\rbox.exe"
 				LinkIncremental="0"
 			/>
@@ -161,7 +161,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="&quot;..\tmp\qhulllib\Debug\qhull.lib&quot;"
+				AdditionalOptions="&quot;..\tmp\libqhull\Debug\qhull.lib&quot;"
 				OutputFile="..\rbox.exe"
 				LinkIncremental="0"
 				GenerateDebugInformation="true"
@@ -213,7 +213,7 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\src\qhulllib.h"
+				RelativePath="..\src\libqhull.h"
 				>
 			</File>
 			<File

vcproj/user_eg3.vcproj

@@ -75,7 +75,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="&quot;..\tmp\qhulllib\Release\qhull.lib&quot; &quot;..\tmp\qhullcpp\Release\qhullcpp.lib&quot; "
+				AdditionalOptions="&quot;..\tmp\libqhull\Release\qhull.lib&quot; &quot;..\tmp\qhullcpp\Release\qhullcpp.lib&quot; "
 				OutputFile="..\user_eg3.exe"
 				LinkIncremental="0"
 			/>
@@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="&quot;..\tmp\qhulllib\Debug\qhull.lib&quot; &quot;..\tmp\qhullcpp\Debug\qhullcpp.lib&quot; "
+				AdditionalOptions="&quot;..\tmp\libqhull\Debug\qhull.lib&quot; &quot;..\tmp\qhullcpp\Debug\qhullcpp.lib&quot; "
 				OutputFile="../user_eg3.exe"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"