diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-08-25 10:57:09 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:09 +0200 |
| commit | 2be1fb4eadb449b82c4c72bfa8b5f5ab2e3f3a80 (patch) | |
| tree | 846c24060563079e3af0c4a736bd80c229ef97f1 /extensions | |
| parent | 5d0c35242bb24605ca9ce6f45806b8997a17799b (diff) | |
fix extensions build with Win8 SDK
Change-Id: I7c38722c98300f419e6129b46c89b68f46ce4173
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_oleautobridge.mk | 4 | ||||
| -rw-r--r-- | extensions/Library_oleautobridge2.mk | 4 | ||||
| -rw-r--r-- | extensions/Library_so_activex.mk | 1 | ||||
| -rw-r--r-- | extensions/Library_so_activex_x64.mk | 1 | ||||
| -rw-r--r-- | extensions/source/activex/StdAfx2.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/activex/StdAfx2.h | 2 |
6 files changed, 11 insertions, 3 deletions
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index d86a604b1b9a..adbf359271c9 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -38,6 +38,10 @@ $(eval $(call gb_Library_set_include,oleautobridge,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_add_ldflags,oleautobridge,\ + -LIBPATH:$(ATL_LIB) \ +)) + $(eval $(call gb_Library_use_libraries,oleautobridge,\ comphelper \ cppuhelper \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index c7f1a0152034..b6fee4918d9c 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -42,6 +42,10 @@ $(eval $(call gb_Library_set_include,oleautobridge2,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_add_ldflags,oleautobridge2,\ + -LIBPATH:$(ATL_LIB) \ +)) + $(eval $(call gb_Library_use_libraries,oleautobridge2,\ comphelper \ cppuhelper \ diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 733de14eab86..d618127294c8 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,so_activex,\ $(eval $(call gb_Library_add_ldflags,so_activex,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ + -LIBPATH:$(ATL_LIB) \ )) $(eval $(call gb_Library_use_system_win32_libs,so_activex,\ diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 9bc43840d8a3..132f7f067279 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ + -LIBPATH:$(ATL_LIB)/amd64 \ )) $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ diff --git a/extensions/source/activex/StdAfx2.cxx b/extensions/source/activex/StdAfx2.cxx index f1cf88d10d14..d06eb872c7ed 100644 --- a/extensions/source/activex/StdAfx2.cxx +++ b/extensions/source/activex/StdAfx2.cxx @@ -10,12 +10,10 @@ #ifdef _ATL_STATIC_REGISTRY #include <statreg.h> -#include <statreg.cpp> #endif #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG #endif -#include <atlimpl.cpp> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h index 5c540b0ba329..ab267e42352c 100644 --- a/extensions/source/activex/StdAfx2.h +++ b/extensions/source/activex/StdAfx2.h @@ -12,7 +12,7 @@ #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #endif #define _ATL_APARTMENT_THREADED #define _ATL_STATIC_REGISTRY |