Skip to content

Commit 71c4c99

Browse files
committed
fix unversioned structure for mac catalyst
1 parent 98a9134 commit 71c4c99

File tree

2 files changed

+60
-24
lines changed

2 files changed

+60
-24
lines changed

configure

Lines changed: 31 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -724,18 +724,35 @@ AC_ARG_ENABLE([framework],
724724
AC_CONFIG_FILES([Mac/Resources/app/Info.plist])
725725
;;
726726
iOS) :
727-
FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
728-
FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
729-
FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
730-
FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
731-
FRAMEWORKPYTHONW=
732-
INSTALLTARGETS="libinstall inclinstall sharedinstall"
733-
734-
prefix=$PYTHONFRAMEWORKPREFIX
735-
PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
736-
RESSRCDIR=iOS/Resources
737-
738-
AC_CONFIG_FILES([iOS/Resources/Info.plist])
727+
_flag_ios_catalyst=`echo $host | cut -d '-' -f4`
728+
case $_flag_ios_catalyst in
729+
macabi)
730+
FRAMEWORKINSTALLFIRST="frameworkinstallversionedstructure"
731+
FRAMEWORKALTINSTALLFIRST="frameworkinstallversionedstructure "
732+
FRAMEWORKPYTHONW=
733+
INSTALLTARGETS="libinstall inclinstall sharedinstall"
734+
735+
prefix=$PYTHONFRAMEWORKPREFIX
736+
PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
737+
RESSRCDIR=MacCatalyst/Resources
738+
739+
AC_CONFIG_FILES([MacCatalyst/Resources/Info.plist])
740+
;;
741+
*)
742+
FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
743+
FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
744+
FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
745+
FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
746+
FRAMEWORKPYTHONW=
747+
INSTALLTARGETS="libinstall inclinstall sharedinstall"
748+
749+
prefix=$PYTHONFRAMEWORKPREFIX
750+
PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
751+
RESSRCDIR=iOS/Resources
752+
753+
AC_CONFIG_FILES([iOS/Resources/Info.plist])
754+
;;
755+
esac
739756
;;
740757
tvOS) :
741758
FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"

0 commit comments

Comments
 (0)