diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-27 15:23:42 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-27 15:24:12 +0200 |
| commit | ec64bf60d902afbec91e6eed3dbda08e075ffc3f (patch) | |
| tree | 8a9cf37b65643f7a95923841ddcb226c12c095a0 /shell | |
| parent | 88b363abeb05a2f0b0e4900216169a4cae7b3dcf (diff) | |
shell: use x64 zlib version here
Change-Id: Ie61966f28b937db7d4997753cc388332dda25f63
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 | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 7ea310914c8b..e3baee3faced 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\ $(eval $(call gb_Library_use_externals,ooofilt_x64,\ expat_utf16_x64 \ - zlib \ + zlib_x64 \ )) $(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 5b07b4c4ee36..e6e9c591e44f 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\ $(eval $(call gb_Library_use_externals,propertyhdl_x64,\ expat_utf16_x64 \ - zlib \ + zlib_x64 \ )) $(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index 0d70683044c6..33656b49ae8d 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\ $(eval $(call gb_Library_use_externals,shlxthdl_x64,\ expat_utf16_x64 \ - zlib \ + zlib_x64 \ )) $(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk index 175f8ee7b738..41b1ae623184 100644 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -53,8 +53,8 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ )) $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ - expat_utf16 \ - zlib \ + expat_utf16_x64 \ + zlib_x64 \ )) $(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shlxthandler_common_x64,\ |