diff options
| author | Andras Timar <atimar@suse.com> | 2012-05-29 23:58:25 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-05-30 00:00:09 +0200 |
| commit | d131867357e85307f229d2920492c9ae2be3abeb (patch) | |
| tree | 4dff398b20cc99a7a121441298d14253c17dae10 /shell | |
| parent | a3c47760e122baaf55f39107597aff2f5957aecd (diff) | |
use 64-bit compiler and linker for 64-bit Windows shell extensions
Change-Id: I4ad94eca4ebbf7d8e989dba5a19296d727111850
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_ooofilt_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_propertyhdl_x64.mk | 2 | ||||
| -rw-r--r-- | shell/Library_shlxthdl_x64.mk | 2 | ||||
| -rw-r--r-- | shell/StaticLibrary_shlxthandler_common_x64.mk | 2 | ||||
| -rw-r--r-- | shell/StaticLibrary_xmlparser_x64.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index f3c99464c656..265672aa090c 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 1a36e2b2923b..46d24ff1c8d5 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 a7e149cf29a9..f5c8c7c7b936 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 95e9911d8952..5665e4b5c9aa 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 f833c9436ff6..19443807e1a2 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 \ )) |