shell/Library_ooofilt_x64.mk | 2 +- shell/Library_propertyhdl_x64.mk | 2 +- shell/Library_shlxthdl_x64.mk | 2 +- shell/StaticLibrary_shlxthandler_common_x64.mk | 2 +- shell/StaticLibrary_xmlparser_x64.mk | 2 +- solenv/gbuild/StaticLibrary.mk | 2 ++ 6 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit d131867357e85307f229d2920492c9ae2be3abeb Author: Andras Timar <[email protected]> Date: Tue May 29 23:58:25 2012 +0200 use 64-bit compiler and linker for 64-bit Windows shell extensions Change-Id: I4ad94eca4ebbf7d8e989dba5a19296d727111850 diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index f3c9946..265672a 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -88,7 +88,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ /EXPORT:DllUnregisterServer \ )) -$(eval $(call gb_Library_add_generated_exception_objects,ooofilt_x64,\ +$(eval $(call gb_Library_add_x64_generated_exception_objects,ooofilt_x64,\ CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 1a36e2b..46d24ff 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -87,7 +87,7 @@ $(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ /EXPORT:DllGetClassObject \ )) -$(eval $(call gb_Library_add_generated_exception_objects,propertyhdl_x64,\ +$(eval $(call gb_Library_add_x64_generated_exception_objects,propertyhdl_x64,\ CustomTarget/shell/source/win32/shlxthandler/prophdl/propertyhdl \ )) diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index a7e149c..f5c8c7c 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ /EXPORT:DllUnregisterServer \ )) -$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\ +$(eval $(call gb_Library_add_x64_generated_exception_objects,shlxthdl_x64,\ CustomTarget/shell/source/win32/shlxthandler/classfactory \ CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \ CustomTarget/shell/source/win32/shlxthandler/infotips/infotips \ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 95e9911..5665e4b 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -58,7 +58,7 @@ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ zlib \ )) -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shlxthandler_common_x64,\ +$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shlxthandler_common_x64,\ CustomTarget/shell/source/win32/ooofilereader/autostyletag \ CustomTarget/shell/source/win32/ooofilereader/basereader \ CustomTarget/shell/source/win32/ooofilereader/contentreader \ diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index f833c94..1944380 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -34,7 +34,7 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,shell_xmlparser_x64,\ +$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\ CustomTarget/shell/source/all/xml_parser \ )) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 8458319..e8ef3e6 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -90,6 +90,7 @@ $(eval $(foreach method,\ add_asmobject \ add_asmobjects \ add_exception_objects \ + add_x64_generated_exception_objects \ add_noexception_objects \ add_generated_cobjects \ add_generated_cxxobjects \ @@ -101,6 +102,7 @@ $(eval $(foreach method,\ add_objcflags \ add_objcxxflags \ set_objcxxflags \ + set_x64 \ add_defs \ set_defs \ set_include \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
