mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add VS2010 project, avoids unreliable vcupgrade

Browse Source
This commit is contained in:
Tor Lillqvist
2012-12-13 18:10:35 +02:00
committed by Tor Lillqvist
parent 20379fca09
commit 355cbe5ca5
5 changed files with 180 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
liborcus/ExternalProject_liborcus.mk
View File

@@ -33,11 +33,10 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static-nozip.vcproj \
&& MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
&& touch $@
endif
else
# must be built with debug STL if --enable-dbgutil

4
liborcus/UnpackedTarball_orcus.mk
View File

@@ -27,4 +27,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,orcus,\
$(foreach patch,$(orcus_patches),liborcus/$(patch)) \
))
$(eval $(call gb_UnpackedTarball_add_file,orcus,vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj,liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj))
$(eval $(call gb_UnpackedTarball_add_file,orcus,vsprojects/liborcus/DefaultConfig.props,liborcus/vsprojects/liborcus/DefaultConfig.props))
$(eval $(call gb_UnpackedTarball_add_file,orcus,vsprojects/liborcus/zLib.props,liborcus/vsprojects/liborcus/zLib.props))
# vim: set noet sw=4 ts=4:

147
liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj Normal file
View File

@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.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="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{50DD1B15-9FEB-4037-9FBF-D52A711977E7}</ProjectGuid>
<RootNamespace>liborcusnozip</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</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')" Label="LocalAppDataPlatform" />
<Import Project="..\liborcus\DefaultConfig.props" />
<Import Project="..\liborcus\zLib.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')" Label="LocalAppDataPlatform" />
<Import Project="..\liborcus\DefaultConfig.props" />
<Import Project="..\liborcus\zLib.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__ORCUS_STATIC_LIB;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)orcus.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__ORCUS_STATIC_LIB;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)orcus.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\liborcus\dom_tree.cpp" />
<ClCompile Include="..\..\src\liborcus\exception.cpp" />
<ClCompile Include="..\..\src\liborcus\global.cpp" />
<ClCompile Include="..\..\src\liborcus\orcus_css.cpp" />
<ClCompile Include="..\..\src\liborcus\orcus_csv.cpp" />
<ClCompile Include="..\..\src\liborcus\orcus_gnumeric.cpp" />
<ClCompile Include="..\..\src\liborcus\orcus_xml.cpp" />
<ClCompile Include="..\..\src\liborcus\pstring.cpp" />
<ClCompile Include="..\..\src\liborcus\spreadsheet_interface.cpp" />
<ClCompile Include="..\..\src\liborcus\string_pool.cpp" />
<ClCompile Include="..\..\src\liborcus\tokens.cpp" />
<ClCompile Include="..\..\src\liborcus\xml_context.cpp" />
<ClCompile Include="..\..\src\liborcus\xml_handler.cpp" />
<ClCompile Include="..\..\src\liborcus\xml_map_tree.cpp" />
<ClCompile Include="..\..\src\liborcus\xml_namespace.cpp" />
<ClCompile Include="..\..\src\liborcus\xml_parser.cpp" />
<ClCompile Include="..\..\src\liborcus\xml_simple_handler.cpp" />
<ClCompile Include="..\..\src\liborcus\xml_structure_tree.cpp" />
<ClCompile Include="..\..\src\liborcus\gnumeric_cell_context.cpp" />
<ClCompile Include="..\..\src\liborcus\gnumeric_context.cpp" />
<ClCompile Include="..\..\src\liborcus\gnumeric_handler.cpp" />
<ClCompile Include="..\..\src\liborcus\gnumeric_helper.cpp" />
<ClCompile Include="..\..\src\liborcus\gnumeric_sheet_context.cpp" />
<ClCompile Include="..\..\src\liborcus\gnumeric_tokens.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\liborcus\xml_map_tree.hpp" />
<ClInclude Include="..\..\include\orcus\cell_buffer.hpp" />
<ClInclude Include="..\..\include\orcus\css_parser.hpp" />
<ClInclude Include="..\..\include\orcus\csv_parser.hpp" />
<ClInclude Include="..\..\include\orcus\dom_tree.hpp" />
<ClInclude Include="..\..\include\orcus\env.hpp" />
<ClInclude Include="..\..\include\orcus\exception.hpp" />
<ClInclude Include="..\..\include\orcus\spreadsheet\export_interface.hpp" />
<ClInclude Include="..\..\include\orcus\global.hpp" />
<ClInclude Include="..\..\include\orcus\spreadsheet\import_interface.hpp" />
<ClInclude Include="..\..\include\orcus\orcus_csv.hpp" />
<ClInclude Include="..\..\include\orcus\orcus_gnumeric.hpp" />
<ClInclude Include="..\..\include\orcus\orcus_xml.hpp" />
<ClInclude Include="..\..\include\orcus\pstring.hpp" />
<ClInclude Include="..\..\include\orcus\sax_ns_parser.hpp" />
<ClInclude Include="..\..\include\orcus\sax_parser.hpp" />
<ClInclude Include="..\..\include\orcus\sax_token_parser.hpp" />
<ClInclude Include="..\..\src\liborcus\string_pool.hpp" />
<ClInclude Include="..\..\include\orcus\tokens.hpp" />
<ClInclude Include="..\..\include\orcus\spreadsheet\types.hpp" />
<ClInclude Include="..\..\include\orcus\types.hpp" />
<ClInclude Include="..\..\include\orcus\xml_context.hpp" />
<ClInclude Include="..\..\include\orcus\xml_handler.hpp" />
<ClInclude Include="..\..\include\orcus\xml_namespace.hpp" />
<ClInclude Include="..\..\include\orcus\xml_parser.hpp" />
<ClInclude Include="..\..\include\orcus\xml_simple_handler.hpp" />
<ClInclude Include="..\..\include\orcus\xml_structure_tree.hpp" />
<ClInclude Include="..\..\include\orcus\gnumeric\gnumeric_cell_context.hpp" />
<ClInclude Include="..\..\include\orcus\gnumeric\gnumeric_context.hpp" />
<ClInclude Include="..\..\include\orcus\gnumeric\gnumeric_handler.hpp" />
<ClInclude Include="..\..\include\orcus\gnumeric\gnumeric_helper.hpp" />
<ClInclude Include="..\..\include\orcus\gnumeric\gnumeric_sheet_context.hpp" />
<ClInclude Include="..\..\include\orcus\gnumeric\gnumeric_token_constants.hpp" />
<ClInclude Include="..\..\include\orcus\gnumeric\gnumeric_tokens.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\liborcus\gnumeric_tokens.inl" />
<None Include="..\..\include\orcus\gnumeric\gnumeric_token_constants.inl" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

14
liborcus/vsprojects/liborcus/DefaultConfig.props Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(BOOST_INCLUDE_DIR);..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>

14
liborcus/vsprojects/liborcus/zLib.props Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>