summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/win32/vs10/croco.vcxprojin20
-rw-r--r--build/win32/vs10/csslint.vcxproj12
-rw-r--r--build/win32/vs10/install.vcxproj4
-rw-r--r--build/win32/vs10/libcroco.props.in102
-rw-r--r--build/win32/vs10/libcroco.sln2
-rw-r--r--build/win32/vs10/test0.vcxproj12
-rw-r--r--build/win32/vs10/test1.vcxproj12
-rw-r--r--build/win32/vs10/test2.vcxproj12
-rw-r--r--build/win32/vs10/test3.vcxproj12
-rw-r--r--build/win32/vs10/test4.vcxproj12
-rw-r--r--build/win32/vs10/test5.vcxproj12
-rw-r--r--build/win32/vs10/test6.vcxproj12
-rw-r--r--build/win32/vs9/croco.vcprojin16
-rw-r--r--build/win32/vs9/csslint.vcproj8
-rw-r--r--build/win32/vs9/libcroco.vsprops.in90
-rw-r--r--build/win32/vs9/test0.vcproj8
-rw-r--r--build/win32/vs9/test1.vcproj8
-rw-r--r--build/win32/vs9/test2.vcproj8
-rw-r--r--build/win32/vs9/test3.vcproj8
-rw-r--r--build/win32/vs9/test4.vcproj8
-rw-r--r--build/win32/vs9/test5.vcproj8
-rw-r--r--build/win32/vs9/test6.vcproj8
22 files changed, 225 insertions, 169 deletions
diff --git a/build/win32/vs10/croco.vcxprojin b/build/win32/vs10/croco.vcxprojin
index 7384716..19097d2 100644
--- a/build/win32/vs10/croco.vcxprojin
+++ b/build/win32/vs10/croco.vcxprojin
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -109,7 +113,7 @@ See COPYRIGHTS file for copyright information.
<ModuleDefinitionFile>$(IntDir)libcroco.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -137,7 +141,7 @@ See COPYRIGHTS file for copyright information.
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -166,7 +170,7 @@ See COPYRIGHTS file for copyright information.
<ModuleDefinitionFile>$(IntDir)libcroco.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -197,7 +201,7 @@ See COPYRIGHTS file for copyright information.
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
diff --git a/build/win32/vs10/csslint.vcxproj b/build/win32/vs10/csslint.vcxproj
index 29a82c8..704fe9d 100644
--- a/build/win32/vs10/csslint.vcxproj
+++ b/build/win32/vs10/csslint.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 04f6913..5396641 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -46,19 +46,23 @@ See COPYRIGHTS file for copyright information.
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/libcroco.props.in b/build/win32/vs10/libcroco.props.in
index ca02951..d267c50 100644
--- a/build/win32/vs10/libcroco.props.in
+++ b/build/win32/vs10/libcroco.props.in
@@ -20,8 +20,10 @@ See COPYRIGHTS file for copyright information.
-->
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
- <LibCrocoApiVersion>@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@</LibCrocoApiVersion>
- <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+ <ApiVersion>@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@</ApiVersion>
+ <VSVer>10</VSVer>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
<LibCrocoDoInstall>
mkdir $(GlibEtcInstallRoot)
@@ -32,86 +34,86 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(GlibEtcInstallRoot)\
copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(GlibEtcInstallRoot)\bin
-mkdir $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+mkdir $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\libcroco.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\libcroco.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\libcroco-config.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\libcroco-config.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-additional-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-additional-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-attr-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-attr-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-cascade.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-cascade.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-declaration.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-declaration.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-doc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-doc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-enc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-enc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-fonts.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-fonts.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-input.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-input.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-num.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-num.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-om-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-om-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-parsing-location.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-parsing-location.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-prop-list.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-prop-list.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-pseudo.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-pseudo.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-rgb.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-rgb.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-selector.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-selector.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-sel-eng.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-sel-eng.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-simple-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-simple-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-statement.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-statement.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-string.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-string.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-stylesheet.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-stylesheet.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-style.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-style.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-term.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-term.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-tknzr.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-tknzr.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-token.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-token.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
-copy ..\..\..\src\cr-utils.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco
+copy ..\..\..\src\cr-utils.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco
mkdir $(GlibEtcInstallRoot)\lib
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(LibCrocoApiVersion).lib $(GlibEtcInstallRoot)\lib
+copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(GlibEtcInstallRoot)\lib
</LibCrocoDoInstall>
<GenerateLibCrocoDef>
-if exist $(IntDir)libcroco.def goto END
+if exist $(DefDir)libcroco.def goto END
-echo EXPORTS &gt; $(IntDir)libcroco.def
+echo EXPORTS &gt; $(DefDir)libcroco.def
-cl /EP ..\..\..\src\libcroco.symbols &gt;&gt; $(IntDir)libcroco.def
+cl /EP ..\..\..\src\libcroco.symbols &gt;&gt; $(DefDir)libcroco.def
:END
</GenerateLibCrocoDef>
<LibCrocoLibtoolCompatibleDllPrefix>lib</LibCrocoLibtoolCompatibleDllPrefix>
- <LibCrocoLibtoolCompatibleDllSuffix>-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-0</LibCrocoLibtoolCompatibleDllSuffix>
- <LibCrocoSeparateVS10DllPrefix />
- <LibCrocoSeparateVS10DllSuffix>-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-vs10</LibCrocoSeparateVS10DllSuffix>
- <LibCrocoDllPrefix>$(LibCrocoSeparateVS10DllPrefix)</LibCrocoDllPrefix>
- <LibCrocoDllSuffix>$(LibCrocoSeparateVS10DllSuffix)</LibCrocoDllSuffix>
+ <LibCrocoLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibCrocoLibtoolCompatibleDllSuffix>
+ <LibCrocoSeparateVSDllPrefix />
+ <LibCrocoSeparateVSDllSuffix>-$(ApiVersion)-vs$(VSVer)</LibCrocoSeparateVSDllSuffix>
+ <LibCrocoDllPrefix>$(LibCrocoSeparateVSDllPrefix)</LibCrocoDllPrefix>
+ <LibCrocoDllSuffix>$(LibCrocoSeparateVSDllSuffix)</LibCrocoDllSuffix>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>libcrocoprops</_PropertySheetDisplayName>
@@ -120,7 +122,7 @@ cl /EP ..\..\..\src\libcroco.symbols &gt;&gt; $(IntDir)libcroco.def
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\src;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src;..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
@@ -140,12 +142,18 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <BuildMacro Include="LibCrocoApiVersion">
- <Value>$(LibCrocoApiVersion)</Value>
+ <BuildMacro Include="ApiVersion">
+ <Value>$(ApiVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="VSVer">
+ <Value>$(VSVer)</Value>
</BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
+ <BuildMacro Include="DefDir">
+ <Value>$(DefDir)</Value>
+ </BuildMacro>
<BuildMacro Include="LibCrocoDoInstall">
<Value>$(LibCrocoDoInstall)</Value>
</BuildMacro>
@@ -158,11 +166,11 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h
<BuildMacro Include="LibCrocoLibtoolCompatibleDllSuffix">
<Value>$(LibCrocoLibtoolCompatibleDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="LibCrocoSeparateVS10DllPrefix">
- <Value>$(LibCrocoSeparateVS10DllPrefix)</Value>
+ <BuildMacro Include="LibCrocoSeparateVSDllPrefix">
+ <Value>$(LibCrocoSeparateVSDllPrefix)</Value>
</BuildMacro>
- <BuildMacro Include="LibCrocoSeparateVS10DllSuffix">
- <Value>$(LibCrocoSeparateVS10DllSuffix)</Value>
+ <BuildMacro Include="LibCrocoSeparateVSDllSuffix">
+ <Value>$(LibCrocoSeparateVSDllSuffix)</Value>
</BuildMacro>
<BuildMacro Include="LibCrocoDllPrefix">
<Value>$(LibCrocoDllPrefix)</Value>
diff --git a/build/win32/vs10/libcroco.sln b/build/win32/vs10/libcroco.sln
index ba21f0b..4ef9eaf 100644
--- a/build/win32/vs10/libcroco.sln
+++ b/build/win32/vs10/libcroco.sln
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "croco", "croco.vcxproj", "{4AFE9F9B-7F78-41A8-B066-C7CA89938ABA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csslint", "csslint.vcxproj", "{345080B1-9C5B-44B8-98D7-7381D50F3E13}"
diff --git a/build/win32/vs10/test0.vcxproj b/build/win32/vs10/test0.vcxproj
index 0347753..b4ca02f 100644
--- a/build/win32/vs10/test0.vcxproj
+++ b/build/win32/vs10/test0.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/test1.vcxproj b/build/win32/vs10/test1.vcxproj
index 20ca8c4..25db3c9 100644
--- a/build/win32/vs10/test1.vcxproj
+++ b/build/win32/vs10/test1.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/test2.vcxproj b/build/win32/vs10/test2.vcxproj
index 9f0699c..4364ca7 100644
--- a/build/win32/vs10/test2.vcxproj
+++ b/build/win32/vs10/test2.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/test3.vcxproj b/build/win32/vs10/test3.vcxproj
index b66aae7..63d0356 100644
--- a/build/win32/vs10/test3.vcxproj
+++ b/build/win32/vs10/test3.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/test4.vcxproj b/build/win32/vs10/test4.vcxproj
index fb6565b..6d71343 100644
--- a/build/win32/vs10/test4.vcxproj
+++ b/build/win32/vs10/test4.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/test5.vcxproj b/build/win32/vs10/test5.vcxproj
index 289a9e7..737ff9f 100644
--- a/build/win32/vs10/test5.vcxproj
+++ b/build/win32/vs10/test5.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/test6.vcxproj b/build/win32/vs10/test6.vcxproj
index 4c01461..390c1cd 100644
--- a/build/win32/vs10/test6.vcxproj
+++ b/build/win32/vs10/test6.vcxproj
@@ -45,21 +45,25 @@ See COPYRIGHTS file for copyright information.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs9/croco.vcprojin b/build/win32/vs9/croco.vcprojin
index 413b322..2fa10af 100644
--- a/build/win32/vs9/croco.vcprojin
+++ b/build/win32/vs9/croco.vcprojin
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="2"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -71,7 +71,7 @@ See COPYRIGHTS file for copyright information.
ModuleDefinitionFile="$(IntDir)\libcroco.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -79,7 +79,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="2"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -111,7 +111,7 @@ See COPYRIGHTS file for copyright information.
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -119,7 +119,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="2"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -152,7 +152,7 @@ See COPYRIGHTS file for copyright information.
ModuleDefinitionFile="$(IntDir)\libcroco.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
@@ -160,7 +160,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="2"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -196,7 +196,7 @@ See COPYRIGHTS file for copyright information.
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(LibCrocoApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
diff --git a/build/win32/vs9/csslint.vcproj b/build/win32/vs9/csslint.vcproj
index 2bd5043..a377ffb 100644
--- a/build/win32/vs9/csslint.vcproj
+++ b/build/win32/vs9/csslint.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/libcroco.vsprops.in b/build/win32/vs9/libcroco.vsprops.in
index 39129d9..841c0f1 100644
--- a/build/win32/vs9/libcroco.vsprops.in
+++ b/build/win32/vs9/libcroco.vsprops.in
@@ -45,12 +45,20 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
"
/>
<UserMacro
- Name="LibCrocoApiVersion"
+ Name="ApiVersion"
Value="@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@"
/>
<UserMacro
+ Name="VSVer"
+ Value="9"
+ />
+ <UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\..\vs9\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="DefDir"
+ Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
/>
<UserMacro
Name="LibCrocoDoInstall"
@@ -60,46 +68,46 @@ mkdir $(GlibEtcInstallRoot)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(GlibEtcInstallRoot)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(GlibEtcInstallRoot)\bin&#x0D;&#x0A;
-mkdir $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\libcroco.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\libcroco-config.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-additional-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-attr-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-cascade.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-declaration.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-doc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-enc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-fonts.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-input.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-num.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-om-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-parsing-location.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-prop-list.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-pseudo.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-rgb.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-selector.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-sel-eng.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-simple-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-statement.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-string.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-stylesheet.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-style.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-term.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-tknzr.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-token.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
-copy ..\..\..\src\cr-utils.h $(GlibEtcInstallRoot)\include\libcroco-$(LibCrocoApiVersion)\libcroco&#x0D;&#x0A;
+mkdir $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\libcroco.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\libcroco-config.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-additional-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-attr-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-cascade.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-declaration.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-doc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-enc-handler.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-fonts.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-input.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-num.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-om-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-parser.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-parsing-location.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-prop-list.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-pseudo.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-rgb.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-selector.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-sel-eng.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-simple-sel.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-statement.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-string.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-stylesheet.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-style.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-term.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-tknzr.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-token.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
+copy ..\..\..\src\cr-utils.h $(GlibEtcInstallRoot)\include\libcroco-$(ApiVersion)\libcroco&#x0D;&#x0A;
mkdir $(GlibEtcInstallRoot)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(LibCrocoApiVersion).lib $(GlibEtcInstallRoot)\lib&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(GlibEtcInstallRoot)\lib&#x0D;&#x0A;
"
/>
<UserMacro
Name="GenerateLibCrocoDef"
Value="
-if exist $(IntDir)\libcroco.def goto END&#x0D;&#x0A;
-echo EXPORTS &gt; $(IntDir)\libcroco.def&#x0D;&#x0A;
-cl /EP ..\..\..\src\libcroco.symbols &gt;&gt; $(IntDir)\libcroco.def&#x0D;&#x0A;
+if exist $(DefDir)\libcroco.def goto END&#x0D;&#x0A;
+echo EXPORTS &gt; $(DefDir)\libcroco.def&#x0D;&#x0A;
+cl /EP ..\..\..\src\libcroco.symbols &gt;&gt; $(DefDir)\libcroco.def&#x0D;&#x0A;
:END&#x0D;&#x0A;
"
/>
@@ -109,24 +117,24 @@ cl /EP ..\..\..\src\libcroco.symbols &gt;&gt; $(IntDir)\libcroco.def&#x0D;&#x0A
/>
<UserMacro
Name="LibCrocoLibtoolCompatibleDllSuffix"
- Value="-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-0"
+ Value="-$(ApiVersion)-0"
/>
<UserMacro
- Name="LibCrocoSeparateVS9DllPrefix"
+ Name="LibCrocoSeparateVSDllPrefix"
Value=""
/>
<UserMacro
- Name="LibCrocoSeparateVS9DllSuffix"
- Value="-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-vs9"
+ Name="LibCrocoSeparateVSDllSuffix"
+ Value="-$(ApiVersion)-vs$(VSVer)"
/>
<!-- Change these two to LibCrocoLibtoolCompatibleDllPrefix and
LibCrocoLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="LibCrocoDllPrefix"
- Value="$(LibCrocoSeparateVS9DllPrefix)"
+ Value="$(LibCrocoSeparateVSDllPrefix)"
/>
<UserMacro
Name="LibCrocoDllSuffix"
- Value="$(LibCrocoSeparateVS9DllSuffix)"
+ Value="$(LibCrocoSeparateVSDllSuffix)"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/test0.vcproj b/build/win32/vs9/test0.vcproj
index ea24120..b3e1a63 100644
--- a/build/win32/vs9/test0.vcproj
+++ b/build/win32/vs9/test0.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/test1.vcproj b/build/win32/vs9/test1.vcproj
index be880ea..3afdc25 100644
--- a/build/win32/vs9/test1.vcproj
+++ b/build/win32/vs9/test1.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/test2.vcproj b/build/win32/vs9/test2.vcproj
index c5674b8..486a1d8 100644
--- a/build/win32/vs9/test2.vcproj
+++ b/build/win32/vs9/test2.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/test3.vcproj b/build/win32/vs9/test3.vcproj
index fe7989d..144cf8c 100644
--- a/build/win32/vs9/test3.vcproj
+++ b/build/win32/vs9/test3.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/test4.vcproj b/build/win32/vs9/test4.vcproj
index 6d4653f..69de428 100644
--- a/build/win32/vs9/test4.vcproj
+++ b/build/win32/vs9/test4.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/test5.vcproj b/build/win32/vs9/test5.vcproj
index fe29055..6238a3f 100644
--- a/build/win32/vs9/test5.vcproj
+++ b/build/win32/vs9/test5.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
diff --git a/build/win32/vs9/test6.vcproj b/build/win32/vs9/test6.vcproj
index 3c02617..7ee8fb9 100644
--- a/build/win32/vs9/test6.vcproj
+++ b/build/win32/vs9/test6.vcproj
@@ -42,7 +42,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -72,7 +72,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|Win32"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -105,7 +105,7 @@ See COPYRIGHTS file for copyright information.
Name="Debug|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -139,7 +139,7 @@ See COPYRIGHTS file for copyright information.
Name="Release|x64"
InheritedPropertySheets=".\libcroco.vsprops"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
View Lorry Controller Status