Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add unicode build targets and standardize string handling #2

Merged
merged 2 commits into from
Aug 12, 2014
Merged

Add unicode build targets and standardize string handling #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2923352
Add unicode build targets and standardize string handling so that it …
Aug 11, 2014
445fec3
Fix incorrect conversion of cUserPath if condition
Aug 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added proj/Release - Unicode/BuildLog.htm
View file
Open in desktop
Binary file not shown.
22 changes: 14 additions & 8 deletions proj/webLib.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified proj/webLib.suo
View file
Open in desktop
Binary file not shown.
208 changes: 205 additions & 3 deletions proj/webLib.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -16,7 +16,7 @@
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
Name="Release - Non-Unicode|Win32"
OutputDirectory="../build/release"
IntermediateDirectory="../build/release"
ConfigurationType="2"
Expand Down Expand Up @@ -113,7 +113,7 @@
/>
</Configuration>
<Configuration
Name="Debug|Win32"
Name="Debug - Non-Unicode|Win32"
OutputDirectory="../build/debug"
IntermediateDirectory="../build/debug"
ConfigurationType="2"
Expand Down Expand Up @@ -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>
Expand Down
Loading