From 6fb2acc9cd5e2b9624e1a6f43c2e708d81c6d35a Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 10 May 2022 14:19:17 +0200 Subject: [PATCH] makepanda: Always build tinydisplay, even without X11, for offline rendering Closes #1288 Co-authored-by: Brian Gontowski --- makepanda/makepanda.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index e66768aa5b..afff30627a 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -5568,8 +5568,10 @@ if (GetTarget() == 'android' and PkgSkip("EGL")==0 and PkgSkip("GLES")==0 and no # DIRECTORY: panda/src/tinydisplay/ # -if (not RUNTIME and (GetTarget() in ('windows', 'darwin') or PkgSkip("X11")==0) and PkgSkip("TINYDISPLAY")==0): - OPTS=['DIR:panda/src/tinydisplay', 'BUILDING:TINYDISPLAY', 'X11'] +if not RUNTIME and not PkgSkip("TINYDISPLAY"): + OPTS=['DIR:panda/src/tinydisplay', 'BUILDING:TINYDISPLAY'] + if not PkgSkip("X11"): + OPTS += ['X11'] TargetAdd('p3tinydisplay_composite1.obj', opts=OPTS, input='p3tinydisplay_composite1.cxx') TargetAdd('p3tinydisplay_composite2.obj', opts=OPTS, input='p3tinydisplay_composite2.cxx') TargetAdd('p3tinydisplay_ztriangle_1.obj', opts=OPTS, input='ztriangle_1.cxx') @@ -5584,7 +5586,7 @@ if (not RUNTIME and (GetTarget() in ('windows', 'darwin') or PkgSkip("X11")==0) elif GetTarget() == 'windows': TargetAdd('libp3tinydisplay.dll', input='libp3windisplay.dll') TargetAdd('libp3tinydisplay.dll', opts=['WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM']) - else: + elif not PkgSkip("X11"): TargetAdd('libp3tinydisplay.dll', input='p3x11display_composite1.obj') TargetAdd('libp3tinydisplay.dll', opts=['X11']) TargetAdd('libp3tinydisplay.dll', input='p3tinydisplay_composite1.obj')