diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-06-27 11:24:38 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-06-27 11:27:27 +0200 |
| commit | 3e8746506f063380387f3db5c3f849446ab58deb (patch) | |
| tree | 9a342e7411cb4bef0531cd8fbc5ce03d48bb1a60 /bridges | |
| parent | e1d1c84dc994aedcf27b46cc96b4b8f79997c40e (diff) | |
iOS, first attempt to get bridges compiling.
Need to adapt for other iOS CPU´s
Change-Id: Icb0b49265d3ec67057e57bfe5610389afe404568
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 01ee21f848fe..086cb6f566a8 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -9,17 +9,23 @@ $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno)) -ifeq ($(CPUNAME),ARM) - ifeq ($(OS),IOS) -$(eval $(call gb_Library_use_sdk_api,gcc3_uno)) bridges_SELECTED_BRIDGE := gcc3_ios_arm -bridge_asm_objects := helper -bridge_exception_objects := cpp2uno cpp2uno-arm cpp2uno-arm64 cpp2uno-i386 except uno2cpp uno2cpp-arm uno2cpp-arm64 uno2cpp-i386 -$(eval $(call gb_Library_use_custom_headers,gcc3_uno,\ - bridges/source/cpp_uno/gcc3_ios_arm \ -)) -else ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) +bridge_noopt_objects := cpp2uno except uno2cpp +# HACK +#$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \ +# $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist +#$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \ +# EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist + +#$(eval $(call gb_Library_use_sdk_api,gcc3_uno)) +#bridge_asm_objects := helper +#bridge_exception_objects := cpp2uno cpp2uno-arm cpp2uno-arm64 cpp2uno-i386 except uno2cpp uno2cpp-arm uno2cpp-arm64 uno2cpp-i386 +#$(eval $(call gb_Library_use_custom_headers,gcc3_uno,bridges/source/cpp_uno/gcc3_ios_arm)) + +else ifeq ($(CPUNAME),ARM) + +ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_arm bridge_noopt_objects := cpp2uno except uno2cpp # HACK |