added platform configuration for x64 (building on VS 2008). Building …

…to this platform cause huge of type-conversion warnings (mainly size_t -> int and int64 -> int) which need further revision.
nzinfo · Dec 2, 2008 · 8b78ee9 · 8b78ee9
1 parent 63bf8e8
commit 8b78ee9
Show file tree

Hide file tree

Showing 8 changed files with 1,045 additions and 35 deletions.
diff --git a/sphinx08.sln b/sphinx08.sln
@@ -34,33 +34,59 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{405619C7-CC22-4FB8-9237-B196CB897355}.Debug|Win32.ActiveCfg = Debug|Win32
 		{405619C7-CC22-4FB8-9237-B196CB897355}.Debug|Win32.Build.0 = Debug|Win32
+		{405619C7-CC22-4FB8-9237-B196CB897355}.Debug|x64.ActiveCfg = Debug|x64
+		{405619C7-CC22-4FB8-9237-B196CB897355}.Debug|x64.Build.0 = Debug|x64
 		{405619C7-CC22-4FB8-9237-B196CB897355}.Release|Win32.ActiveCfg = Release|Win32
 		{405619C7-CC22-4FB8-9237-B196CB897355}.Release|Win32.Build.0 = Release|Win32
+		{405619C7-CC22-4FB8-9237-B196CB897355}.Release|x64.ActiveCfg = Release|x64
+		{405619C7-CC22-4FB8-9237-B196CB897355}.Release|x64.Build.0 = Release|x64
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Debug|Win32.Build.0 = Debug|Win32
+		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Debug|x64.ActiveCfg = Debug|x64
+		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Debug|x64.Build.0 = Debug|x64
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Release|Win32.ActiveCfg = Release|Win32
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Release|Win32.Build.0 = Release|Win32
+		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Release|x64.ActiveCfg = Release|x64
+		{6A1685DE-0265-4243-965F-96CB53EBBCA6}.Release|x64.Build.0 = Release|x64
 		{571DC41A-2665-476C-ABED-3899324E19AB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{571DC41A-2665-476C-ABED-3899324E19AB}.Debug|Win32.Build.0 = Debug|Win32
+		{571DC41A-2665-476C-ABED-3899324E19AB}.Debug|x64.ActiveCfg = Debug|x64
+		{571DC41A-2665-476C-ABED-3899324E19AB}.Debug|x64.Build.0 = Debug|x64
 		{571DC41A-2665-476C-ABED-3899324E19AB}.Release|Win32.ActiveCfg = Release|Win32
 		{571DC41A-2665-476C-ABED-3899324E19AB}.Release|Win32.Build.0 = Release|Win32
+		{571DC41A-2665-476C-ABED-3899324E19AB}.Release|x64.ActiveCfg = Release|x64
+		{571DC41A-2665-476C-ABED-3899324E19AB}.Release|x64.Build.0 = Release|x64
 		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Debug|Win32.Build.0 = Debug|Win32
+		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Debug|x64.ActiveCfg = Debug|x64
+		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Debug|x64.Build.0 = Debug|x64
 		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Release|Win32.ActiveCfg = Release|Win32
 		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Release|Win32.Build.0 = Release|Win32
+		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Release|x64.ActiveCfg = Release|x64
+		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Release|x64.Build.0 = Release|x64
 		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|Win32.Build.0 = Debug|Win32
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|x64.ActiveCfg = Debug|x64
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|x64.Build.0 = Debug|x64
 		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|Win32.ActiveCfg = Release|Win32
 		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|Win32.Build.0 = Release|Win32
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|x64.ActiveCfg = Release|x64
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|x64.Build.0 = Release|x64
 		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Debug|Win32.Build.0 = Debug|Win32
+		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Debug|x64.ActiveCfg = Debug|x64
+		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Debug|x64.Build.0 = Debug|x64
 		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Release|Win32.ActiveCfg = Release|Win32
 		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Release|Win32.Build.0 = Release|Win32
+		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Release|x64.ActiveCfg = Release|x64
+		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/sphinx.cpp b/src/sphinx.cpp
@@ -441,16 +441,10 @@ class CSphEasyTimer
 
 #if USE_WINDOWS
 
+#pragma intrinsic(__rdtsc)
 INT64 sphClocks ()
 {
-	DWORD tLo, tHi;
-	_asm
-	{
-		rdtsc
-			mov		tLo, eax
-			mov		tHi, edx
-	}
-	return ( INT64(tHi)<<32 ) | INT64(tLo);
+	return __rdtsc();
 }
 
 
@@ -20255,7 +20249,7 @@ bool CSphSource_MSSQL::SqlQuery ( const char * sQuery )
 	{
 		QueryColumn_t & tCol = m_dColumns[i];
 
-		SQLUINTEGER uColSize = 0;
+		SQLULEN uColSize = 0;
 		SQLSMALLINT iNameLen = 0;
 		SQLSMALLINT iDataType = 0;
 		if ( SQLDescribeCol ( m_hStmt, SQLUSMALLINT(i+1), (SQLCHAR*)szColumnName, MAX_NAME_LEN, &iNameLen, &iDataType, &uColSize, NULL, NULL ) == SQL_ERROR )

diff --git a/win/indexer08.vcproj b/win/indexer08.vcproj
@@ -16,14 +16,17 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)/bin/$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)/junk/$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)/bin/$(PlatformName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/junk/$(PlatformName)/$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -105,8 +108,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)/bin/$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)/junk/$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)/bin/$(PlatformName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/junk/$(PlatformName)/$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -183,6 +186,171 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)/bin/$(PlatformName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/junk/$(PlatformName)/$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			ExcludeBuckets="5;6;8;9;13;14;15"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				ExceptionHandling="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				EnablePREfast="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/indexer.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(SolutionDir)/libstemmer_c/lib/$(ConfigurationName); $(SolutionDir)/libexpat/lib/$(ConfigurationName)"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/indexer.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)/bin/$(PlatformName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/junk/$(PlatformName)/$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			ExcludeBuckets="5;6;8;9;13;14;15"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/indexer.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(SolutionDir)/libstemmer_c/lib/$(ConfigurationName); $(SolutionDir)/libexpat/lib/$(ConfigurationName)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>