Prechádzať zdrojové kódy

Fix incorrect PC-BSD checks

rdb 16 rokov pred
rodič
commit
85bd762709
2 zmenil súbory, kde vykonal 3 pridanie a 3 odobranie
  1. 1 1
      makepanda/makepanda.py
  2. 2 2
      makepanda/makepandacore.py

+ 1 - 1
makepanda/makepanda.py

@@ -443,7 +443,7 @@ if (COMPILER=="LINUX"):
           IncDirectory("FREETYPE", "/usr/X11/include/freetype2")
         IncDirectory("OPENGL", "/usr/X11R6/include")
 
-    if (platform.uname()[1]=="pcbsd"):
+    if (os.path.exists("/usr/PCBSD")):
         IncDirectory("ALWAYS", "/usr/PCBSD/local/include")
         LibDirectory("ALWAYS", "/usr/PCBSD/local/lib")
      

+ 2 - 2
makepanda/makepandacore.py

@@ -1178,7 +1178,7 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
                 incdir = sorted(glob.glob("/usr/include/" + i))[-1]
             elif (len(glob.glob("/usr/local/include/" + i)) > 0):
                 incdir = sorted(glob.glob("/usr/local/include/" + i))[-1]
-            elif (platform.uname()[1]=="pcbsd" and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0):
+            elif (os.path.isdir("/usr/PCBSD") and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0):
                 incdir = sorted(glob.glob("/usr/PCBSD/local/include/" + i))[-1]
             else:
                 have_pkg = False
@@ -1629,7 +1629,7 @@ def CheckLinkerLibraryPath():
             os.environ["DYLD_LIBRARY_PATH"] = builtlib
      
     # Workaround around compile issue on PCBSD
-    if (platform.uname()[1]=="pcbsd"):
+    if (os.path.exists("/usr/PCBSD")):
         os.environ["LD_LIBRARY_PATH"] += ":/usr/PCBSD/local/lib"
 
 ########################################################################