[Libreoffice-commits] core.git: 5 commits - external/clucene external/cppunit external/glew external/icu external/lcms2 solenv/gbuild
Tor Lillqvist
tml at collabora.com
Mon Jul 7 10:53:41 PDT 2014
external/clucene/configs/clucene-config-MSVC.h | 2 ++
external/cppunit/ExternalProject_cppunit.mk | 2 +-
external/glew/ExternalProject_glew.mk | 2 +-
external/icu/ExternalProject_icu.mk | 2 +-
external/lcms2/ExternalProject_lcms2.mk | 2 +-
solenv/gbuild/platform/com_MSC_defs.mk | 7 +++++++
6 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 3efe9b2954797d01970a088eec55817751304b4a
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jul 7 20:50:31 2014 +0300
Handle VCVER==120 (VS 2013) too
Change-Id: I4dbf663790bd8906ef8b123a01bdf52e0c0c1962
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk
index 2f3217d..9e67828 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -17,7 +17,7 @@ ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
+ $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0)" \
&& msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \
&& cd ../DllPlugInTester \
diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk
index 918d275..de1ba93 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -17,7 +17,7 @@ ifeq ($(COM),MSC)
$(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 110 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,build/vc10)
else
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index 82664ae..1712c96 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
MSBuild.exe lcms2_DLL.vcxproj \
/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 110 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,Projects/VC2010/lcms2_DLL)
else
$(call gb_ExternalProject_get_state_target,lcms2,build):
commit 71aedada9ed00ae5cf463e6c17c9996dc4510884
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jul 7 20:49:36 2014 +0300
Use gb_DEBUG_CFLAGS to get -FS for VS 2013
Change-Id: I22485919713f5cafb494992a36c5ada21bdcc18c
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 8f1104e..04d33a6 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -22,7 +22,7 @@ ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_ExternalProject_run,build,\
export LIB="$(ILIB)" \
- && CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" \
+ && CFLAGS="$(SOLARINC) $(gb_DEBUG_CFLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC) $(gb_DEBUG_CFLAGS)" \
./runConfigureICU \
$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \
Cygwin/MSVC \
commit e64a4441bb955f7112440c6ba4ec33c5f9f2eb23
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jul 7 20:48:58 2014 +0300
VS 2013 already has float_t
Change-Id: Ibf6f1d60fc7ec92e24fc366dc193cbd70f13c18c
diff --git a/external/clucene/configs/clucene-config-MSVC.h b/external/clucene/configs/clucene-config-MSVC.h
index edd4a3b..638bc4d 100644
--- a/external/clucene/configs/clucene-config-MSVC.h
+++ b/external/clucene/configs/clucene-config-MSVC.h
@@ -49,7 +49,9 @@ typedef unsigned int uint32_t;
typedef signed long long int64_t;
typedef unsigned long long uint64_t;
+#if _MSC_VER < 1800
typedef double float_t;
+#endif
typedef unsigned long _cl_dword_t;
/* undef size_t size_t */
commit 9a60c2395ab482eaa95e07fae540dbf9fdfe262f
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jul 7 20:46:50 2014 +0300
chmod -x
Change-Id: Ia39ce5eeb26a11c633bc414872481d0bc08910dc
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
old mode 100755
new mode 100644
commit 4b9c4da2f3056f44a054c2147ef5c570f434bd7e
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jul 7 20:45:21 2014 +0300
Use -FS with VS 2013
Change-Id: I31cb7aec1a48b7b052f104ea3558cb13595a3687
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 6e590b5..40fc910 100755
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -258,6 +258,13 @@ gb_LinkTarget_LDFLAGS := \
gb_DEBUG_CFLAGS := -Zi
+ifeq ($(VCVER),120)
+# Use -FS with VS2013: "Force Synchronous PDB Writes. Forces writes to
+# the program database (PDB) file--created by /Zi or /ZI--to be
+# serialized through MSPDBSRV.EXE"
+gb_DEBUG_CFLAGS+=-FS
+endif
+
# this does not use CFLAGS so it is not overridable
ifneq ($(ENABLE_CRASHDUMP),)
gb_CFLAGS+=-Zi
More information about the Libreoffice-commits
mailing list