TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Fix build error when flex is absent

Browse Source
This commit is contained in:
rdb 2021-01-02 19:29:56 +01:00
parent fd2041d209
commit 6690b2d86e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -1664,7 +1664,7 @@ def CompileFlex(wobj,wsrc,opts):
dashi = opts.count("FLEXDASHI") dashi = opts.count("FLEXDASHI")
flex = GetFlex() flex = GetFlex()
want_version = GetValueOption(opts, "FLEXVERSION:") want_version = GetValueOption(opts, "FLEXVERSION:")
if want_version: if flex and want_version:
# Is flex at the required version for this file? # Is flex at the required version for this file?
want_version = tuple(map(int, want_version.split('.'))) want_version = tuple(map(int, want_version.split('.')))
have_version = GetFlexVersion() have_version = GetFlexVersion()

2
makepanda/makepandacore.py
View File

@ -556,7 +556,7 @@ def GetFlex():
def GetFlexVersion(): def GetFlexVersion():
flex = GetFlex() flex = GetFlex()
if not flex: if not flex:
return None return (0, 0, 0)
try: try:
handle = subprocess.Popen(["flex", "--version"], executable=flex, stdout=subprocess.PIPE) handle = subprocess.Popen(["flex", "--version"], executable=flex, stdout=subprocess.PIPE)