From 4a8e1f8773c99cda042a319fd63e1f75d833d82b Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 19 May 2010 15:40:06 +0000 Subject: [PATCH] Untested fix for some kind of compiler error on archlinux --- makepanda/makepanda.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 06ced744a1..48a766d471 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -463,7 +463,7 @@ if (COMPILER=="LINUX"): IncDirectory("FREETYPE", "/usr/X11/include/freetype2") IncDirectory("OPENGL", "/usr/X11R6/include") - if (os.path.exists("/usr/PCBSD")): + if (os.path.isdir("/usr/PCBSD")): IncDirectory("ALWAYS", "/usr/PCBSD/local/include") LibDirectory("ALWAYS", "/usr/PCBSD/local/lib") @@ -471,8 +471,10 @@ if (COMPILER=="LINUX"): IncDirectory("ALWAYS", "/usr/local/include") LibDirectory("ALWAYS", "/usr/local/lib") - if (os.path.exists("/usr/lib64")): + # Workaround for an issue where pkg-config does not include this path + if (os.path.isdir("/usr/lib64/glib-2.0/include")): IncDirectory("GTK2", "/usr/lib64/glib-2.0/include") + if (os.path.isdir("/usr/lib64/gtk-2.0/include")): IncDirectory("GTK2", "/usr/lib64/gtk-2.0/include") fcollada_libs = ("FColladaD", "FColladaSD")