[Libreoffice-commits] .: 2 commits - shell/Library_ooofilt_x64.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl_x64.mk shell/StaticLibrary_shlxthandler_common_x64.mk tools/CustomTarget_reversemap.mk

[Libreoffice Gerrit user]

 shell/Library_ooofilt_x64.mk                   |    2 +-
 shell/Library_propertyhdl_x64.mk               |    2 +-
 shell/Library_shlxthdl_x64.mk                  |    2 +-
 shell/StaticLibrary_shlxthandler_common_x64.mk |    4 ++--
 tools/CustomTarget_reversemap.mk               |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ec64bf60d902afbec91e6eed3dbda08e075ffc3f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Oct 27 15:23:42 2012 +0200

    shell: use x64 zlib version here
    
    Change-Id: Ie61966f28b937db7d4997753cc388332dda25f63

diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 7ea3109..e3baee3 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 5b07b4c..e6e9c59 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 0d70683..33656b4 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 175f8ee..41b1ae6 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,\
commit 88b363abeb05a2f0b0e4900216169a4cae7b3dcf
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Oct 27 14:52:00 2012 +0200

    there is no sal_textenc for Android
    
    Change-Id: I7a55f775cf1b9d608a71e1d754df7027545c1254

diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
index a047909..5cfdaed 100644
--- a/tools/CustomTarget_reversemap.mk
+++ b/tools/CustomTarget_reversemap.mk
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_target,tools/reversemap) : \
 
 $(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \
 		$(call gb_Executable_get_target_for_build,bestreversemap) \
-		| $(call gb_Library_get_target,sal_textenc) \
+		| $(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \
 		$(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
 	$(call gb_Helper_execute,bestreversemap > $@)