Kaydet (Commit) 5c23224c authored tarafından jan Iversen's avatar jan Iversen

iOS, removed unused declaration

Change-Id: I8867048756a0484d1b75515335f3a2002f128e6d
üst c26bdf54
...@@ -6,12 +6,11 @@ ...@@ -6,12 +6,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
#- Env ------------------------------------------------------------------------ #- Env ------------------------------------------------------------------------
IOSDEV = /Applications/Xcode.app/Contents/Developer/ IOSLD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
ifeq ($(ENABLE_DEBUG),TRUE) ifeq ($(ENABLE_DEBUG),TRUE)
IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib
else else
IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a
endif endif
...@@ -30,14 +29,24 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT) ...@@ -30,14 +29,24 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
FORCE: FORCE:
$(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
$(IOSLD) -r -ios_version_min 11.2 \ #ifeq ($(ENABLE_DEBUG),TRUE)
$(IOSLD) -dylib -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \ -syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \
-o $(IOSOBJ) \ -o $(IOSKIT) \
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \ $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \ `$(SRCDIR)/bin/lo-all-static-libs` \
$(call gb_StaticLibrary_get_target,iOS_kitBridge) $(call gb_StaticLibrary_get_target,iOS_kitBridge)
$(AR) -r $(IOSKIT) $(IOSOBJ) #else
# $(IOSLD) -r -ios_version_min 11.2 \
# -syslibroot $(MACOSX_SDK_PATH) \
# -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \
# -o $(IOSOBJ) \
# $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
# `$(SRCDIR)/bin/lo-all-static-libs` \
# $(call gb_StaticLibrary_get_target,iOS_kitBridge)
# $(AR) -r $(IOSKIT) $(IOSOBJ)
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment