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

fix extensions build with Win8 SDK

Browse Source 
Change-Id: I7c38722c98300f419e6129b46c89b68f46ce4173
This commit is contained in:
Peter Foley
2012-08-25 10:57:09 -04:00
committed by David Tardon
parent 5d0c35242b
commit 2be1fb4ead
7 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/Library_oleautobridge.mk
View File

@@ -38,6 +38,10 @@ $(eval $(call gb_Library_set_include,oleautobridge,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_ldflags,oleautobridge,\
-LIBPATH:$(ATL_LIB) \
))
$(eval $(call gb_Library_use_libraries,oleautobridge,\ $(eval $(call gb_Library_use_libraries,oleautobridge,\
comphelper \ comphelper \
cppuhelper \ cppuhelper \

4
extensions/Library_oleautobridge2.mk
View File

@@ -42,6 +42,10 @@ $(eval $(call gb_Library_set_include,oleautobridge2,\
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_ldflags,oleautobridge2,\
-LIBPATH:$(ATL_LIB) \
))
$(eval $(call gb_Library_use_libraries,oleautobridge2,\ $(eval $(call gb_Library_use_libraries,oleautobridge2,\
comphelper \ comphelper \
cppuhelper \ cppuhelper \

1
extensions/Library_so_activex.mk
View File

@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,so_activex,\
$(eval $(call gb_Library_add_ldflags,so_activex,\ $(eval $(call gb_Library_add_ldflags,so_activex,\
/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
-LIBPATH:$(ATL_LIB) \
)) ))
$(eval $(call gb_Library_use_system_win32_libs,so_activex,\ $(eval $(call gb_Library_use_system_win32_libs,so_activex,\

1
extensions/Library_so_activex_x64.mk
View File

@@ -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,\ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\
/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
-LIBPATH:$(ATL_LIB)/amd64 \
)) ))
$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\

2
extensions/source/activex/StdAfx2.cxx
View File

@@ -10,12 +10,10 @@
#ifdef _ATL_STATIC_REGISTRY #ifdef _ATL_STATIC_REGISTRY
#include <statreg.h> #include <statreg.h>
#include <statreg.cpp>
#endif #endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) #if defined(_MSC_VER) && (_MSC_VER >= 1300)
#undef _DEBUG #undef _DEBUG
#endif #endif
#include <atlimpl.cpp>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
extensions/source/activex/StdAfx2.h
View File

@@ -12,7 +12,7 @@
#define STRICT #define STRICT
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400 #define _WIN32_WINNT 0x0403
#endif #endif
#define _ATL_APARTMENT_THREADED #define _ATL_APARTMENT_THREADED
#define _ATL_STATIC_REGISTRY #define _ATL_STATIC_REGISTRY

3
solenv/gbuild/platform/WNT_INTEL_MSC.mk
View File

@@ -360,7 +360,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \ $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86) \ $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86) \
$(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 -LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \ $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64 -LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
$(if $(filter 80,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/win8/um/x64,),) \
$(T_LDFLAGS) \ $(T_LDFLAGS) \
@$${RESPONSEFILE} \ @$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \