|
@@ -287,8 +287,8 @@ endif
|
|
|
ifndef CROSSBINDIR
|
|
|
CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
|
|
|
endif
|
|
|
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
|
|
|
-ifeq ($(OS_SOURCE),darwin)
|
|
|
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
|
|
|
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
|
|
|
DARWIN2DARWIN=1
|
|
|
endif
|
|
|
endif
|
|
@@ -1215,7 +1215,7 @@ DEBUGSYMEXT=.xcoff
|
|
|
SHORTSUFFIX=mac
|
|
|
IMPORTLIBPREFIX=imp
|
|
|
endif
|
|
|
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
|
|
|
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
|
|
|
BATCHEXT=.sh
|
|
|
EXEEXT=
|
|
|
HASSHAREDLIB=1
|