liborcus/ExternalPackage_liborcus.mk | 20
+
liborcus/ExternalProject_liborcus.mk | 35
--
liborcus/Module_liborcus.mk | 2
liborcus/Package_liborcus.mk | 20
-
liborcus/UnpackedTarball_orcus.mk | 10
liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch | 20
-
liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj | 147
----------
liborcus/vsprojects/liborcus/DefaultConfig.props | 14
liborcus/vsprojects/liborcus/zLib.props | 14
libwpd/ExternalPackage_libwpd.mk | 2
libwpd/ExternalProject_libwpd.mk | 24
-
solenv/gcc-wrappers/g++.cxx | 2
solenv/gcc-wrappers/gcc.cxx | 2
solenv/gcc-wrappers/wrapper.cxx | 22
+
14 files changed, 51 insertions(+), 283 deletions(-)
New commits:
commit d956ddc54c486e24505029b9bdac314416b256d6
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 16 10:25:57 2013 -0400
move libwpd to gcc-wrapper
Change-Id: I4ebe006d0e8850d7229de7a59e424fa819ca7700
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index f2375d1..ae1b029 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -29,7 +29,7 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-s
$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call
gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
+$(eval $(call
gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,src/lib/.libs/libwpd-0.9.lib))
else
$(eval $(call
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
endif
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
index f015c49..0f20be7 100644
--- a/libwpd/ExternalProject_libwpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -11,30 +11,12 @@ $(eval $(call gb_ExternalProject_ExternalProject,libwpd))
$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
+$(eval $(call gb_ExternalProject_use_autoconf,libwpd,build))
+
$(eval $(call gb_ExternalProject_register_targets,libwpd,\
build \
))
-ifeq ($(OS)$(COM),WNTMSC)
-
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,libwpd,build) :
- $(call gb_ExternalProject_run,build,\
- $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32"
\
- ,build/win32)
-else ifeq ($(VCVER),100)
-$(call gb_ExternalProject_get_state_target,libwpd,build) :
- $(call gb_ExternalProject_run,build,\
- msbuild.exe libwpd.vcxproj /p:Configuration=Release \
- ,build/win32)
-else
-$(call gb_ExternalProject_get_state_target,libwpd,build) :
- $(call gb_ExternalProject_run,build,\
- msbuild.exe libwpd.vcxproj /p:PlatformToolset=v110
/p:VisualStudioVersion=11.0 /p:TargetName=libwpd-0.9 /p:Configuration=Release \
- ,build/win32)
-endif
-else
-
$(call gb_ExternalProject_get_state_target,libwpd,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
@@ -50,6 +32,4 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
&& $(MAKE) \
)
-endif
-
# vim: set noet sw=4 ts=4:
commit 2eaf9fd4e0643d348df57114def27ccea3afa665
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 16 10:18:35 2013 -0400
add support for more options to gcc-wrapper
Change-Id: If43721642f2453671e74ccda9572f873360ca65a
diff --git a/solenv/gcc-wrappers/g++.cxx b/solenv/gcc-wrappers/g++.cxx
index d2ee3d5..19106af 100755
--- a/solenv/gcc-wrappers/g++.cxx
+++ b/solenv/gcc-wrappers/g++.cxx
@@ -18,6 +18,8 @@ int main(int argc, char *argv[]) {
setupccenv();
+ cerr << "CXX= " << command << " " << args << endl;
+
return startprocess(command,args);
}
diff --git a/solenv/gcc-wrappers/gcc.cxx b/solenv/gcc-wrappers/gcc.cxx
index b8983cf..e8b15bb 100755
--- a/solenv/gcc-wrappers/gcc.cxx
+++ b/solenv/gcc-wrappers/gcc.cxx
@@ -18,6 +18,8 @@ int main(int argc, char *argv[]) {
setupccenv();
+ cerr << "CC= " << command << " " << args << endl;
+
return startprocess(command,args);
}
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 4976305..7a4fb91 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -71,13 +71,20 @@ string processccargs(vector<string> rawargs) {
// TODO: should these options be enabled globally?
args.append(" -EHsc");
args.append(" -MD");
+ args.append(" -Gy");
+ args.append(" -Zc:wchar_t-");
+ args.append(" -Ob1 -Oxs -Oy-");
for(vector<string>::iterator i = rawargs.begin(); i != rawargs.end(); ++i)
{
args.append(" ");
if(*i == "-o") {
// TODO: handle more than just exe output
- args.append("-Fe");
++i;
+ size_t dot=(*i).find_last_of(".");
+ if(!(*i).compare(dot+1,3,"obj"))
+ args.append("-Fo");
+ else if(!(*i).compare(dot+1,3,"exe"))
+ args.append("-Fe");
args.append(*i);
}
else if(*i == "-g")
@@ -90,6 +97,17 @@ string processccargs(vector<string> rawargs) {
}
args.append(*i);
}
+ else if(!(*i).compare(0,2,"-L")) {
+ args.append("-link -LIBPATH:"+(*i).substr(2));
+ }
+ else if(!(*i).compare(0,2,"-l")) {
+ args.append((*i).substr(2)+"lib.lib");
+ }
+ else if(!(*i).compare(0,12,"-fvisibility")) {
+ //TODO: drop other gcc-specific options
+ }
+ else if(*i == "-Werror")
+ args.append("-WX");
else
args.append(*i);
}
@@ -156,7 +174,7 @@ int startprocess(string command, string args) {
exit(1);
}
if(readlen!=0) {
- WriteFile(stdout_handle,buffer,readlen,&writelen,NULL);
+ WriteFile(stdout_handle,buffer,readlen,&writelen,NULL);
}
}
GetExitCodeProcess(pi.hProcess, &ret);
commit 82c4b9491aa9a9d20eede8184e5bd1f7b04efee4
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 16 09:52:43 2013 -0400
move liborcus to gcc-wrapper
Change-Id: I9d3ba7b142ec230d11af59f9eb21d203b0473dc8
diff --git a/liborcus/ExternalPackage_liborcus.mk
b/liborcus/ExternalPackage_liborcus.mk
new file mode 100644
index 0000000..159faac
--- /dev/null
+++ b/liborcus/ExternalPackage_liborcus.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,orcus))
+
+$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call
gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.4.lib))
+else
+$(eval $(call
gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.4.a))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/liborcus/ExternalProject_liborcus.mk
b/liborcus/ExternalProject_liborcus.mk
index e932648..c725345 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -11,42 +11,14 @@ $(eval $(call gb_ExternalProject_ExternalProject,liborcus))
$(eval $(call gb_ExternalProject_use_unpacked,liborcus,orcus))
+$(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
+
$(eval $(call gb_ExternalProject_use_external,liborcus,boost_headers))
$(eval $(call gb_ExternalProject_register_targets,liborcus,\
build \
))
-ifeq ($(OS)$(COM),WNTMSC)
-
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,liborcus,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call
gb_UnpackedTarball_get_dir,boost) \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export BOOST_LIB_DIR=$(OUTDIR)/lib \
- && $(COMPATH)/vcpackages/vcbuild.exe
liborcus-static-nozip.vcproj "Release|Win32" \
- ,vsprojects/liborcus-static-nozip)
-else ifeq ($(VCVER),100)
-$(call gb_ExternalProject_get_state_target,liborcus,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call
gb_UnpackedTarball_get_dir,boost) \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export BOOST_LIB_DIR=$(OUTDIR)/lib \
- && MSBuild.exe liborcus-static-nozip.vcxproj
/p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus
/p:WholeProgramOptimization=no \
- ,vsprojects/liborcus-static-nozip)
-else
-$(call gb_ExternalProject_get_state_target,liborcus,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call
gb_UnpackedTarball_get_dir,boost) \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && export BOOST_LIB_DIR=$(OUTDIR)/lib \
- && MSBuild.exe liborcus-static-nozip.vcxproj
/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release
/p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
- ,vsprojects/liborcus-static-nozip)
-endif
-
-else
-
# Must be built with debug GNU C++ library if --enable-dbgutil has
# caused the LO code to be built thusly.
@@ -67,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-spreadsheet-model \
--disable-werror \
$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY
ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \
+ $(if $(filter
MSC,$(COM)),CPPFLAGS="-DBOOST_ALL_NO_LIB") \
CXXFLAGS="$(BOOST_CXXFLAGS) $(if $(filter
NO,$(SYSTEM_BOOST)),\
-I$(call
gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter
YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \
@@ -74,6 +47,4 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
&& $(MAKE) \
)
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk
index 440d1b5..af18ad3 100644
--- a/liborcus/Module_liborcus.mk
+++ b/liborcus/Module_liborcus.mk
@@ -13,7 +13,7 @@ ifeq ($(SYSTEM_LIBORCUS),NO)
$(eval $(call gb_Module_add_targets,liborcus,\
ExternalProject_liborcus \
- Package_liborcus \
+ ExternalPackage_liborcus \
UnpackedTarball_orcus \
))
diff --git a/liborcus/Package_liborcus.mk b/liborcus/Package_liborcus.mk
deleted file mode 100644
index 9ad1459..0000000
--- a/liborcus/Package_liborcus.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,liborcus,$(call
gb_UnpackedTarball_get_dir,orcus)))
-
-$(eval $(call gb_Package_use_external_project,liborcus,liborcus))
-
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call
gb_Package_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static-nozip/Release/orcus.lib))
-else
-$(eval $(call
gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.4.a))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/liborcus/UnpackedTarball_orcus.mk
b/liborcus/UnpackedTarball_orcus.mk
index de0788a..13be4e6 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -16,23 +16,13 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
orcus_patches :=
# make config.sub recognize arm-linux-androideabi
orcus_patches += liborcus_0.1.0-configure.patch
-# disable boost "auto lib" in MSVC build
-orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
# <https://gitorious.org/orcus/orcus/merge_requests/2#
# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
orcus_patches += liborcus_0.1.0-boost-include.patch.1
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
- vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
-))
-
$(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:
diff --git a/liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch
b/liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch
deleted file mode 100644
index dec1422..0000000
--- a/liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj
2012-09-07 06:00:35.000000000 +0200
-+++ vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj
2012-09-10 18:10:23.821600000 +0200
-@@ -42,7 +42,7 @@
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="__ORCUS_STATIC_LIB"
-+
PreprocessorDefinitions="__ORCUS_STATIC_LIB;BOOST_ALL_NO_LIB"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
-@@ -107,7 +107,7 @@
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="__ORCUS_STATIC_LIB"
-+
PreprocessorDefinitions="__ORCUS_STATIC_LIB;BOOST_ALL_NO_LIB"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- WarningLevel="3"
diff --git
a/liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj
b/liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj
deleted file mode 100644
index 08caf055..0000000
--- a/liborcus/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcxproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/liborcus/vsprojects/liborcus/DefaultConfig.props
b/liborcus/vsprojects/liborcus/DefaultConfig.props
deleted file mode 100644
index 743f443..0000000
--- a/liborcus/vsprojects/liborcus/DefaultConfig.props
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/liborcus/vsprojects/liborcus/zLib.props
b/liborcus/vsprojects/liborcus/zLib.props
deleted file mode 100644
index 191ce13..0000000
--- a/liborcus/vsprojects/liborcus/zLib.props
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>
\ No newline at end of file
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
