[Libreoffice-commits] .: embedserv/Library_emser.mk embedserv/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 6 19:10:42 PDT 2012
embedserv/Library_emser.mk | 4 ++++
embedserv/source/embed/esdll.cxx | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 5084b6dca889e83da13c917a15fafd10a698f326
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Aug 25 10:31:14 2012 -0400
fix embedserv build with Win8 SDK
Change-Id: I3a51a563fa3c2a57cbbe44087f0f4958c2b41a69
Reviewed-on: https://gerrit.libreoffice.org/790
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 4d7e0d0..25d265b 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -66,6 +66,10 @@ $(eval $(call gb_Library_add_libs,emser,\
))
endif
+$(eval $(call gb_Library_add_ldflags,emser,\
+ -LIBPATH:$(ATL_LIB) \
+))
+
$(eval $(call gb_Library_add_exception_objects,emser,\
embedserv/source/embed/docholder \
embedserv/source/embed/ed_idataobj \
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 44089bf..6df9c2e 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -18,7 +18,7 @@
*/
#define STRICT
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0403
#define _WIN32_DCOM
#if defined(_MSC_VER) && (_MSC_VER > 1310)
#pragma warning(disable : 4917 4555)
More information about the Libreoffice-commits
mailing list