소스 검색

I don't trust linking against the Python framework for the runtime build.

rdb 16 년 전
부모
커밋
ac0992bc87
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      makepanda/makepanda.py

+ 5 - 1
makepanda/makepanda.py

@@ -418,7 +418,11 @@ if (COMPILER=="LINUX"):
     PkgEnable("TINYXML",   "",          ("tinyxml"), "tinyxml.h")
     PkgEnable("VRPN",      "",          ("vrpn", "quat"), ("vrpn", "quat.h", "vrpn/vrpn_Types.h"))
     PkgEnable("ZLIB",      "",          ("z"), "zlib.h")
-    PkgEnable("PYTHON",    "", SDK["PYTHONVERSION"], (SDK["PYTHONVERSION"], SDK["PYTHONVERSION"] + "/Python.h"), tool = SDK["PYTHONVERSION"] + "-config", framework = "Python")
+    if (RUNTIME and sys.platform == "darwin"):
+        # Don't use the framework for the OSX runtime build. I'm afraid it gives problems somewhere.
+        PkgEnable("PYTHON",    "", SDK["PYTHONVERSION"], (SDK["PYTHONVERSION"], SDK["PYTHONVERSION"] + "/Python.h"), tool = SDK["PYTHONVERSION"] + "-config")
+    else:
+        PkgEnable("PYTHON",    "", SDK["PYTHONVERSION"], (SDK["PYTHONVERSION"], SDK["PYTHONVERSION"] + "/Python.h"), tool = SDK["PYTHONVERSION"] + "-config", framework = "Python")
     if (RUNTIME):
         PkgEnable("NPAPI", "",          (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr/prtypes.h", "nspr"))
         PkgEnable("WX",    tool = "wx-config")