From 6254263a1fe2d84061e821069e403c9bf511da03 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 30 Nov 2012 09:36:23 +0000 Subject: [PATCH] Don't build Carbon module if Cocoa module is also built --- makepanda/makepanda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 2f9394827f..9fc1c6bafa 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3732,7 +3732,7 @@ if (sys.platform == 'darwin' and PkgSkip("COCOA")==0 and PkgSkip("GL")==0 and no # DIRECTORY: panda/src/osxdisplay/ # -if (sys.platform == 'darwin' and PkgSkip("CARBON")==0 and PkgSkip("GL")==0 and not RUNTIME): +elif (sys.platform == 'darwin' and PkgSkip("CARBON")==0 and PkgSkip("GL")==0 and not RUNTIME): OPTS=['DIR:panda/src/osxdisplay', 'BUILDING:PANDAGL', 'GL', 'NVIDIACG', 'CGGL'] TargetAdd('p3osxdisplay_composite1.obj', opts=OPTS, input='p3osxdisplay_composite1.cxx') TargetAdd('p3osxdisplay_osxGraphicsWindow.obj', opts=OPTS, input='osxGraphicsWindow.mm')