From 5cd6469fd893612a36f5e86ef5ff331b7fcec37b Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 21 Dec 2020 22:08:45 +0100 Subject: [PATCH] makepanda: Don't make built/Frameworks directory unless needed It is no longer needed if we don't ship Cg as a framework, see #1079 [skip ci] --- makepanda/makepanda.py | 1 + makepanda/makepandacore.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index eadb8ce189..fa7df48550 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3337,6 +3337,7 @@ if tp_dir is not None: JustBuilt([target], [tp_lib]) for fwx in glob.glob(tp_pkg + "/*.framework"): + MakeDirectory(GetOutputDir() + "/Frameworks") CopyTree(GetOutputDir() + "/Frameworks/" + os.path.basename(fwx), fwx) else: # Linux / FreeBSD case. diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index fdb10d8388..de8fd0a991 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1255,10 +1255,7 @@ def MakeBuildTree(): MakeDirectory(OUTPUTDIR + "/pandac/input") MakeDirectory(OUTPUTDIR + "/panda3d") - if GetTarget() == 'darwin': - MakeDirectory(OUTPUTDIR + "/Frameworks") - - elif GetTarget() == 'android': + if GetTarget() == 'android': MakeDirectory(OUTPUTDIR + "/classes") ########################################################################