From 54ff2a8dda972be4e3849da9362a61b2c8e95a13 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 29 Feb 2020 16:55:14 +0100 Subject: [PATCH] makepanda: support --cggl-incdir and --cggl-libdir options It's quite hacky right now, but that doesn't matter as we're switching to CMake anyway --- makepanda/makepanda.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 4af9d6402b..8f04251970 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -188,6 +188,7 @@ def parseopts(args): "static","host=","debversion=","rpmrelease=","p3dsuffix=","rtdist-version=", "directx-sdk=", "windows-sdk=", "msvc-version=", "clean", "use-icl", "universal", "target=", "arch=", "git-commit=", "no-copy-python", + "cggl-incdir=", "cggl-libdir=", ] + removedopts anything = 0 @@ -257,7 +258,7 @@ def parseopts(args): elif (option[2:] in removedopts): Warn("Ignoring removed option %s" % (option)) else: - for pkg in PkgListGet(): + for pkg in PkgListGet() + ['CGGL']: if option == "--use-" + pkg.lower(): PkgEnable(pkg) break