Merge pull request #2 from dmckeone/StandardizedStrings

Add unicode build targets and standardize string handling
fb-datax · Aug 12, 2014 · b9ee9a8 · b9ee9a8
2 parents 26eae3e + 445fec3
commit b9ee9a8
Show file tree

Hide file tree

Showing 8 changed files with 345 additions and 91 deletions.
diff --git a/proj/Release - Unicode/BuildLog.htm b/proj/Release - Unicode/BuildLog.htm
diff --git a/proj/webLib.sln b/proj/webLib.sln
@@ -5,20 +5,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webLib", "webLib.vcproj", "
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - Unicode|Win32 = Debug - Unicode|Win32
 		Debug|Win32 = Debug|Win32
+		Release - Unicode|Win32 = Release - Unicode|Win32
 		Release|Win32 = Release|Win32
 		UNICODE Debug|Win32 = UNICODE Debug|Win32
 		UNICODE Release|Win32 = UNICODE Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Debug|Win32.Build.0 = Debug|Win32
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Release|Win32.ActiveCfg = Release|Win32
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Release|Win32.Build.0 = Release|Win32
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Debug|Win32.ActiveCfg = Debug|Win32
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Debug|Win32.Build.0 = Debug|Win32
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Release|Win32.ActiveCfg = Release|Win32
-		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Release|Win32.Build.0 = Release|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Debug - Unicode|Win32.ActiveCfg = Debug - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Debug - Unicode|Win32.Build.0 = Debug - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Debug|Win32.ActiveCfg = Release - Non-Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Debug|Win32.Build.0 = Release - Non-Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Release - Unicode|Win32.ActiveCfg = Release - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Release - Unicode|Win32.Build.0 = Release - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Release|Win32.ActiveCfg = Release - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.Release|Win32.Build.0 = Release - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Debug|Win32.ActiveCfg = Release - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Debug|Win32.Build.0 = Release - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Release|Win32.ActiveCfg = Release - Unicode|Win32
+		{CF830BCD-9C8A-428E-8086-D8F46F247131}.UNICODE Release|Win32.Build.0 = Release - Unicode|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/proj/webLib.suo b/proj/webLib.suo
diff --git a/proj/webLib.vcproj b/proj/webLib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="webLib"
 	ProjectGUID="{CF830BCD-9C8A-428E-8086-D8F46F247131}"
 	RootNamespace="webLib"
@@ -16,7 +16,7 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Release|Win32"
+			Name="Release - Non-Unicode|Win32"
 			OutputDirectory="../build/release"
 			IntermediateDirectory="../build/release"
 			ConfigurationType="2"
@@ -113,7 +113,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
+			Name="Debug - Non-Unicode|Win32"
 			OutputDirectory="../build/debug"
 			IntermediateDirectory="../build/debug"
 			ConfigurationType="2"
@@ -213,6 +213,208 @@
 				CommandLine="$(ProjectDir)\..\resources\testdebug.bat"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug - Unicode|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/webLib.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;IS_DEBUG;isunicode;UNICODE;_UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="false"
+				PrecompiledHeaderFile="../build/debug/webLib.pch"
+				AssemblerOutput="0"
+				AssemblerListingLocation="../build/debug/"
+				ObjectFile="../build/debug/"
+				ProgramDataBaseFileName="../build/debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="awesomium.lib omnisu.lib libiconv.lib"
+				ShowProgress="0"
+				OutputFile="../build/debug/webLib.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\include\lib"
+				ModuleDefinitionFile="../resources/webLib.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="../build/debug/webLib.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="../build/debug/webLib.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="../build/debug/webLib.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(ProjectDir)\..\resources\testdebug.bat"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release - Unicode|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/webLib.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="1"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;iswin32;isXCOMPLIB;NO_STRICT;isunicode;UNICODE;_UNICODE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="false"
+				ForceConformanceInForLoopScope="false"
+				PrecompiledHeaderFile="../build/release/webLib.pch"
+				AssemblerListingLocation="../build/release/"
+				ObjectFile="../build/release/"
+				ProgramDataBaseFileName="../build/release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="awesomium.lib omnisu.lib  libiconv.lib"
+				OutputFile="../build/release/webLib.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\include\lib"
+				ModuleDefinitionFile="../resources/webLib.def"
+				ProgramDatabaseFile="../build/release/webLib.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="../build/release/webLib.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="../build/release/webLib.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(ProjectDir)\..\resources\testrelease.bat"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>