[Libreoffice-commits] core.git: 2 commits - external/glew external/lcms2
Tor Lillqvist
tml at collabora.com
Mon Jul 28 12:10:57 PDT 2014
external/glew/ExternalProject_glew.mk | 3
external/glew/UnpackedTarball_glew.mk | 1
external/glew/glew-vc2013-project.patch.1 | 508 ++++++++++++++++++++++++++++++
external/lcms2/ExternalProject_lcms2.mk | 3
external/lcms2/UnpackedTarball_lcms2.mk | 1
external/lcms2/lcms2-vc2013-project.patch | 490 ++++++++++++++++++++++++++++
6 files changed, 1002 insertions(+), 4 deletions(-)
New commits:
commit 7f0e4cf20ede44240d48d327b3a58bc9d81426f5
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jul 28 21:54:06 2014 +0300
Add separate project file for VS2013
Easier than trying to figure out how to make the VC2010 project work
with VS2013, it seems. Luckily it works fine tojust have VS2013
upgrade the old project file and then pass that to msbuild.
Change-Id: I94c0248211767d97f2898f35b1b677aee372a329
diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk
index d7e553b..7eec3e8 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -18,8 +18,7 @@ $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe glew_shared.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \
- ,build/vc10)
+ ,$(if $(filter 120,$(VCVER)),build/vc12,build/vc10))
else
diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk
index 64cbc5c..242c73e 100644
--- a/external/glew/UnpackedTarball_glew.mk
+++ b/external/glew/UnpackedTarball_glew.mk
@@ -22,6 +22,7 @@ ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_UnpackedTarball_set_patchflags,glew,--binary))
$(eval $(call gb_UnpackedTarball_add_patches,glew,\
external/glew/glew-fix-rc-error.patch.1 \
+ external/glew/glew-vc2013-project.patch.1 \
))
else
$(eval $(call gb_UnpackedTarball_add_patches,glew,\
diff --git a/external/glew/glew-vc2013-project.patch.1 b/external/glew/glew-vc2013-project.patch.1
new file mode 100644
index 0000000..f56769c
--- /dev/null
+++ b/external/glew/glew-vc2013-project.patch.1
@@ -0,0 +1,508 @@
+-*- Mode:Diff -*-
+--- /dev/null
++++ glew/build/vc12/common.props
+@@ -0,0 +1,29 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++ <ImportGroup Label="PropertySheets" />
++ <PropertyGroup Label="UserMacros">
++ <INCLUDE_DIR>../../include</INCLUDE_DIR>
++ <LIB_DIR>../../lib</LIB_DIR>
++ <BIN_DIR>../../bin</BIN_DIR>
++ </PropertyGroup>
++ <PropertyGroup />
++ <ItemDefinitionGroup>
++ <ClCompile>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ </ClCompile>
++ </ItemDefinitionGroup>
++ <ItemGroup>
++ <BuildMacro Include="INCLUDE_DIR">
++ <Value>$(INCLUDE_DIR)</Value>
++ <EnvironmentVariable>true</EnvironmentVariable>
++ </BuildMacro>
++ <BuildMacro Include="LIB_DIR">
++ <Value>$(LIB_DIR)</Value>
++ <EnvironmentVariable>true</EnvironmentVariable>
++ </BuildMacro>
++ <BuildMacro Include="BIN_DIR">
++ <Value>$(BIN_DIR)</Value>
++ <EnvironmentVariable>true</EnvironmentVariable>
++ </BuildMacro>
++ </ItemGroup>
++</Project>
+--- /dev/null
++++ glew/build/vc12/glew_shared.vcxproj
+@@ -0,0 +1,472 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++ <ItemGroup Label="ProjectConfigurations">
++ <ProjectConfiguration Include="Debug MX|Win32">
++ <Configuration>Debug MX</Configuration>
++ <Platform>Win32</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Debug MX|x64">
++ <Configuration>Debug MX</Configuration>
++ <Platform>x64</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Debug|Win32">
++ <Configuration>Debug</Configuration>
++ <Platform>Win32</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Debug|x64">
++ <Configuration>Debug</Configuration>
++ <Platform>x64</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Release MX|Win32">
++ <Configuration>Release MX</Configuration>
++ <Platform>Win32</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Release MX|x64">
++ <Configuration>Release MX</Configuration>
++ <Platform>x64</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Release|Win32">
++ <Configuration>Release</Configuration>
++ <Platform>Win32</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Release|x64">
++ <Configuration>Release</Configuration>
++ <Platform>x64</Platform>
++ </ProjectConfiguration>
++ </ItemGroup>
++ <PropertyGroup Label="Globals">
++ <SccProjectName />
++ <SccLocalPath />
++ <ProjectGuid>{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}</ProjectGuid>
++ </PropertyGroup>
++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|x64'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|x64'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <UseOfMfc>false</UseOfMfc>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
++ <ImportGroup Label="ExtensionSettings">
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|x64'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|x64'" Label="PropertySheets">
++ <Import Project="common.props" />
++ </ImportGroup>
++ <PropertyGroup Label="UserMacros" />
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32mx</TargetName>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|x64'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32mx</TargetName>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32</TargetName>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32</TargetName>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32mxd</TargetName>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|x64'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32mxd</TargetName>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32d</TargetName>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
++ <OutDir>$(BIN_DIR)\$(Configuration)\$(PlatformName)\</OutDir>
++ <IntDir>tmp\$(TargetName)\$(Configuration)\$(PlatformName)\</IntDir>
++ <LinkIncremental>false</LinkIncremental>
++ <TargetName>glew32d</TargetName>
++ </PropertyGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++ <StringPooling>true</StringPooling>
++ <FunctionLevelLinking>true</FunctionLevelLinking>
++ <Optimization>MaxSpeed</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ <TargetEnvironment>Win32</TargetEnvironment>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>NDEBUG;GLEW_MX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalOptions> /ignore:4089</AdditionalOptions>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|x64'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++ <StringPooling>true</StringPooling>
++ <FunctionLevelLinking>true</FunctionLevelLinking>
++ <Optimization>MaxSpeed</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>NDEBUG;GLEW_MX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalOptions> /ignore:4089</AdditionalOptions>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++ <StringPooling>true</StringPooling>
++ <FunctionLevelLinking>true</FunctionLevelLinking>
++ <Optimization>MaxSpeed</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ <TargetEnvironment>Win32</TargetEnvironment>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalOptions> /ignore:4089</AdditionalOptions>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++ <StringPooling>true</StringPooling>
++ <FunctionLevelLinking>true</FunctionLevelLinking>
++ <Optimization>MaxSpeed</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalOptions> /ignore:4089</AdditionalOptions>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++ <FunctionLevelLinking>false</FunctionLevelLinking>
++ <Optimization>Disabled</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ <TargetEnvironment>Win32</TargetEnvironment>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>_DEBUG;GLEW_MX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|x64'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++ <FunctionLevelLinking>false</FunctionLevelLinking>
++ <Optimization>Disabled</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_MX;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>_DEBUG;GLEW_MX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++ <FunctionLevelLinking>false</FunctionLevelLinking>
++ <Optimization>Disabled</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>WIN32;WIN32_MEAN_AND_LEAN;VC_EXTRALEAN;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ <TargetEnvironment>Win32</TargetEnvironment>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
++ <ClCompile>
++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++ <InlineFunctionExpansion>Default</InlineFunctionExpansion>
++ <FunctionLevelLinking>false</FunctionLevelLinking>
++ <Optimization>Disabled</Optimization>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;GLEW_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++ <WarningLevel>Level3</WarningLevel>
++ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ </ClCompile>
++ <Midl>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <MkTypLibCompatible>true</MkTypLibCompatible>
++ </Midl>
++ <ResourceCompile>
++ <Culture>0x0409</Culture>
++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ </ResourceCompile>
++ <Bscmake>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ </Bscmake>
++ <Link>
++ <SuppressStartupBanner>true</SuppressStartupBanner>
++ <LinkDLL>true</LinkDLL>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Console</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ <ImportLibrary>$(LIB_DIR)\$(Configuration)\$(PlatformName)\$(TargetName).lib</ImportLibrary>
++ <BaseAddress>0x62AA0000</BaseAddress>
++ <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalLibraryDirectories>
++ </AdditionalLibraryDirectories>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemGroup>
++ <ClCompile Include="..\..\src\glew.c" />
++ </ItemGroup>
++ <ItemGroup>
++ <ClInclude Include="..\..\include\GL\glew.h" />
++ <ClInclude Include="..\..\include\GL\wglew.h" />
++ </ItemGroup>
++ <ItemGroup>
++ <ResourceCompile Include="..\glew.rc" />
++ </ItemGroup>
++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
++ <ImportGroup Label="ExtensionTargets">
++ </ImportGroup>
++</Project>
commit 0778e00579be8b43ec4a0dd8c36176aea661d683
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jul 28 21:18:18 2014 +0300
Add separate project file for VS2013
Easier than trying to figure out how to make the VC2010 projec work
with VS2013, it seems. We only need a project file for the lcms2_DLL
project.
Change-Id: Icab47ac7625b9a492942ea0835fe52ef06cdf2d9
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index fa61bb7..8bfb514 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -21,8 +21,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 /p:TargetName=lcms2 \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120) \
- ,Projects/VC2010/lcms2_DLL)
+ ,$(if $(filter 120,$(VCVER)),Projects/VC2013/lcms2_DLL,Projects/VC2010/lcms2_DLL))
else
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk
index b128ba3..231fef1 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
external/lcms2/lcms2.patch \
external/lcms2/lcms2-2.4-windows.patch \
+ external/lcms2/lcms2-vc2013-project.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/lcms2-vc2013-project.patch b/external/lcms2/lcms2-vc2013-project.patch
new file mode 100644
index 0000000..fc17a35
--- /dev/null
+++ b/external/lcms2/lcms2-vc2013-project.patch
@@ -0,0 +1,490 @@
+--- /dev/null
++++ foo/foo/lcms2/Projects/VC2013/lcms2.rc
+@@ -0,0 +1,104 @@
++// Microsoft Visual C++ generated resource script.
++//
++#include "resource.h"
++
++#define APSTUDIO_READONLY_SYMBOLS
++/////////////////////////////////////////////////////////////////////////////
++//
++// Generated from the TEXTINCLUDE 2 resource.
++//
++#define APSTUDIO_HIDDEN_SYMBOLS
++#include "windows.h"
++#undef APSTUDIO_HIDDEN_SYMBOLS
++
++/////////////////////////////////////////////////////////////////////////////
++#undef APSTUDIO_READONLY_SYMBOLS
++
++/////////////////////////////////////////////////////////////////////////////
++// Spanish (Spain, International Sort) resources
++
++#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
++LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
++#pragma code_page(1252)
++
++/////////////////////////////////////////////////////////////////////////////
++//
++// Version
++//
++
++1 VERSIONINFO
++ FILEVERSION 2,5,0,0
++ PRODUCTVERSION 2,5,0,0
++ FILEFLAGSMASK 0x0L
++#ifdef _DEBUG
++ FILEFLAGS 0x1L
++#else
++ FILEFLAGS 0x0L
++#endif
++ FILEOS 0x40004L
++ FILETYPE 0x2L
++ FILESUBTYPE 0x0L
++BEGIN
++ BLOCK "StringFileInfo"
++ BEGIN
++ BLOCK "040904e4"
++ BEGIN
++ VALUE "CompanyName", "Marti Maria"
++ VALUE "FileDescription", "lcms color engine"
++ VALUE "FileVersion", "2.5.0.0"
++ VALUE "InternalName", "lcms"
++ VALUE "LegalCopyright", "Copyright © Marti Maria 2013"
++ VALUE "OriginalFilename", "lcms2.dll"
++ VALUE "ProductName", "LittleCMS color engine"
++ VALUE "ProductVersion", "2.5.0.0"
++ END
++ END
++ BLOCK "VarFileInfo"
++ BEGIN
++ VALUE "Translation", 0x409, 1252
++ END
++END
++
++
++#ifdef APSTUDIO_INVOKED
++/////////////////////////////////////////////////////////////////////////////
++//
++// TEXTINCLUDE
++//
++
++1 TEXTINCLUDE
++BEGIN
++ "resource.h\0"
++END
++
++2 TEXTINCLUDE
++BEGIN
++ "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
++ "#include ""windows.h""\r\n"
++ "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
++ "\0"
++END
++
++3 TEXTINCLUDE
++BEGIN
++ "\r\n"
++ "\0"
++END
++
++#endif // APSTUDIO_INVOKED
++
++#endif // Spanish (Spain, International Sort) resources
++/////////////////////////////////////////////////////////////////////////////
++
++
++
++#ifndef APSTUDIO_INVOKED
++/////////////////////////////////////////////////////////////////////////////
++//
++// Generated from the TEXTINCLUDE 3 resource.
++//
++
++
++/////////////////////////////////////////////////////////////////////////////
++#endif // not APSTUDIO_INVOKED
++
+--- /dev/null
++++ foo/foo/lcms2/Projects/VC2013/resource.h
+@@ -0,0 +1,16 @@
++//{{NO_DEPENDENCIES}}
++// Microsoft Visual C++ generated include file.
++// Used by lcms2.rc
++//
++
++// Next default values for new objects
++//
++#ifdef APSTUDIO_INVOKED
++#ifndef APSTUDIO_READONLY_SYMBOLS
++#define _APS_NO_MFC 1
++#define _APS_NEXT_RESOURCE_VALUE 101
++#define _APS_NEXT_COMMAND_VALUE 40001
++#define _APS_NEXT_CONTROL_VALUE 1000
++#define _APS_NEXT_SYMED_VALUE 101
++#endif
++#endif
+--- /dev/null
++++ foo/foo/lcms2/Projects/VC2013/lcms2_DLL/lcms2_DLL.vcxproj
+@@ -0,0 +1,240 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++ <ItemGroup Label="ProjectConfigurations">
++ <ProjectConfiguration Include="Debug|Win32">
++ <Configuration>Debug</Configuration>
++ <Platform>Win32</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Debug|x64">
++ <Configuration>Debug</Configuration>
++ <Platform>x64</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Release|Win32">
++ <Configuration>Release</Configuration>
++ <Platform>Win32</Platform>
++ </ProjectConfiguration>
++ <ProjectConfiguration Include="Release|x64">
++ <Configuration>Release</Configuration>
++ <Platform>x64</Platform>
++ </ProjectConfiguration>
++ </ItemGroup>
++ <PropertyGroup Label="Globals">
++ <ProjectGuid>{8C51BE48-ADB8-4089-A9EC-F6BF993A0548}</ProjectGuid>
++ <RootNamespace>lcms2_DLL</RootNamespace>
++ <Keyword>Win32Proj</Keyword>
++ </PropertyGroup>
++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <CharacterSet>Unicode</CharacterSet>
++ <WholeProgramOptimization>true</WholeProgramOptimization>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <CharacterSet>Unicode</CharacterSet>
++ <WholeProgramOptimization>true</WholeProgramOptimization>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <CharacterSet>Unicode</CharacterSet>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
++ <ConfigurationType>DynamicLibrary</ConfigurationType>
++ <CharacterSet>Unicode</CharacterSet>
++ <PlatformToolset>v120</PlatformToolset>
++ </PropertyGroup>
++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
++ <ImportGroup Label="ExtensionSettings">
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++ </ImportGroup>
++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
++ </ImportGroup>
++ <PropertyGroup Label="UserMacros" />
++ <PropertyGroup>
++ <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
++ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\bin\</OutDir>
++ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\bin\</OutDir>
++ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
++ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
++ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
++ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
++ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\bin\</OutDir>
++ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\bin\</OutDir>
++ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
++ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
++ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
++ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
++ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
++ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
++ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
++ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
++ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
++ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
++ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
++ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
++ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
++ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lcms2</TargetName>
++ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lcms2</TargetName>
++ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lcms2</TargetName>
++ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lcms2</TargetName>
++ </PropertyGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++ <ClCompile>
++ <Optimization>Disabled</Optimization>
++ <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++ <PrecompiledHeader>
++ </PrecompiledHeader>
++ <WarningLevel>Level3</WarningLevel>
++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
++ <MultiProcessorCompilation>true</MultiProcessorCompilation>
++ </ClCompile>
++ <Link>
++ <ModuleDefinitionFile>..\..\..\src\lcms2.def</ModuleDefinitionFile>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Windows</SubSystem>
++ <TargetMachine>MachineX86</TargetMachine>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
++ <ClCompile>
++ <Optimization>Disabled</Optimization>
++ <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++ <PrecompiledHeader>
++ </PrecompiledHeader>
++ <WarningLevel>Level3</WarningLevel>
++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++ <MultiProcessorCompilation>true</MultiProcessorCompilation>
++ </ClCompile>
++ <Link>
++ <ModuleDefinitionFile>
++ </ModuleDefinitionFile>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Windows</SubSystem>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++ <ClCompile>
++ <Optimization>Full</Optimization>
++ <IntrinsicFunctions>true</IntrinsicFunctions>
++ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
++ <OmitFramePointers>true</OmitFramePointers>
++ <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
++ <WholeProgramOptimization>true</WholeProgramOptimization>
++ <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++ <FunctionLevelLinking>true</FunctionLevelLinking>
++ <PrecompiledHeader>
++ </PrecompiledHeader>
++ <WarningLevel>Level4</WarningLevel>
++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++ <StringPooling>true</StringPooling>
++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++ <MultiProcessorCompilation>true</MultiProcessorCompilation>
++ </ClCompile>
++ <Link>
++ <ModuleDefinitionFile>..\..\..\src\lcms2.def</ModuleDefinitionFile>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Windows</SubSystem>
++ <OptimizeReferences>true</OptimizeReferences>
++ <EnableCOMDATFolding>true</EnableCOMDATFolding>
++ <TargetMachine>MachineX86</TargetMachine>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
++ <ClCompile>
++ <Optimization>Full</Optimization>
++ <IntrinsicFunctions>true</IntrinsicFunctions>
++ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
++ <OmitFramePointers>true</OmitFramePointers>
++ <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
++ <WholeProgramOptimization>true</WholeProgramOptimization>
++ <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CMS_DLL_BUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
++ <FunctionLevelLinking>true</FunctionLevelLinking>
++ <PrecompiledHeader>
++ </PrecompiledHeader>
++ <WarningLevel>Level4</WarningLevel>
++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++ <StringPooling>true</StringPooling>
++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++ <MultiProcessorCompilation>true</MultiProcessorCompilation>
++ </ClCompile>
++ <Link>
++ <ModuleDefinitionFile>
++ </ModuleDefinitionFile>
++ <GenerateDebugInformation>true</GenerateDebugInformation>
++ <SubSystem>Windows</SubSystem>
++ <OptimizeReferences>true</OptimizeReferences>
++ <EnableCOMDATFolding>true</EnableCOMDATFolding>
++ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
++ </Link>
++ </ItemDefinitionGroup>
++ <ItemGroup>
++ <ClCompile Include="..\..\..\src\cmscam02.c" />
++ <ClCompile Include="..\..\..\src\cmscgats.c" />
++ <ClCompile Include="..\..\..\src\cmscnvrt.c" />
++ <ClCompile Include="..\..\..\src\cmserr.c" />
++ <ClCompile Include="..\..\..\src\cmsgamma.c" />
++ <ClCompile Include="..\..\..\src\cmsgmt.c" />
++ <ClCompile Include="..\..\..\src\cmshalf.c" />
++ <ClCompile Include="..\..\..\src\cmsintrp.c" />
++ <ClCompile Include="..\..\..\src\cmsio0.c" />
++ <ClCompile Include="..\..\..\src\cmsio1.c" />
++ <ClCompile Include="..\..\..\src\cmslut.c" />
++ <ClCompile Include="..\..\..\src\cmsmd5.c" />
++ <ClCompile Include="..\..\..\src\cmsmtrx.c" />
++ <ClCompile Include="..\..\..\src\cmsnamed.c" />
++ <ClCompile Include="..\..\..\src\cmsopt.c" />
++ <ClCompile Include="..\..\..\src\cmspack.c" />
++ <ClCompile Include="..\..\..\src\cmspcs.c" />
++ <ClCompile Include="..\..\..\src\cmsplugin.c" />
++ <ClCompile Include="..\..\..\src\cmsps2.c" />
++ <ClCompile Include="..\..\..\src\cmssamp.c" />
++ <ClCompile Include="..\..\..\src\cmssm.c" />
++ <ClCompile Include="..\..\..\src\cmstypes.c" />
++ <ClCompile Include="..\..\..\src\cmsvirt.c" />
++ <ClCompile Include="..\..\..\src\cmswtpnt.c" />
++ <ClCompile Include="..\..\..\src\cmsxform.c" />
++ </ItemGroup>
++ <ItemGroup>
++ <CustomBuild Include="..\..\..\src\lcms2.def" />
++ </ItemGroup>
++ <ItemGroup>
++ <ClInclude Include="..\..\..\src\lcms2_internal.h" />
++ <ClInclude Include="..\..\..\include\lcms2.h" />
++ <ClInclude Include="..\..\..\include\lcms2_plugin.h" />
++ <ClInclude Include="..\resource.h" />
++ </ItemGroup>
++ <ItemGroup>
++ <ResourceCompile Include="..\lcms2.rc" />
++ </ItemGroup>
++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
++ <ImportGroup Label="ExtensionTargets">
++ </ImportGroup>
++</Project>
+--- /dev/null
++++ foo/foo/lcms2/Projects/VC2013/lcms2_DLL/lcms2_DLL.vcxproj.filters
+@@ -0,0 +1,118 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++ <ItemGroup>
++ <Filter Include="Header Files">
++ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
++ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
++ </Filter>
++ <Filter Include="Resource Files">
++ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
++ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
++ </Filter>
++ <Filter Include="Source Files">
++ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
++ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
++ </Filter>
++ </ItemGroup>
++ <ItemGroup>
++ <ClCompile Include="..\..\..\src\cmscam02.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmscgats.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmscnvrt.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmserr.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsgamma.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsgmt.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsintrp.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsio0.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsio1.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmslut.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsmd5.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsmtrx.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsnamed.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsopt.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmspack.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmspcs.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsplugin.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsps2.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmssamp.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmssm.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmstypes.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsvirt.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmswtpnt.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmsxform.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\..\src\cmshalf.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ </ItemGroup>
++ <ItemGroup>
++ <ClInclude Include="..\..\..\include\lcms2.h">
++ <Filter>Header Files</Filter>
++ </ClInclude>
++ <ClInclude Include="..\..\..\include\lcms2_plugin.h">
++ <Filter>Header Files</Filter>
++ </ClInclude>
++ <ClInclude Include="..\..\..\src\lcms2_internal.h">
++ <Filter>Source Files</Filter>
++ </ClInclude>
++ <ClInclude Include="..\resource.h">
++ <Filter>Resource Files</Filter>
++ </ClInclude>
++ </ItemGroup>
++ <ItemGroup>
++ <ResourceCompile Include="..\lcms2.rc">
++ <Filter>Resource Files</Filter>
++ </ResourceCompile>
++ </ItemGroup>
++ <ItemGroup>
++ <CustomBuild Include="..\..\..\src\lcms2.def">
++ <Filter>Source Files</Filter>
++ </CustomBuild>
++ </ItemGroup>
++</Project>
More information about the Libreoffice-commits
mailing list