Browse Source

Don't try to locate that much thirdparty packages in a runtime build

rdb 16 years ago
parent
commit
1e07f44712
1 changed files with 17 additions and 16 deletions
  1. 17 16
      makepanda/makepanda.py

+ 17 - 16
makepanda/makepanda.py

@@ -397,25 +397,26 @@ if (COMPILER=="LINUX"):
     fcollada_libs = ("FColladaD", "FColladaSD")
     fcollada_libs = ("FColladaD", "FColladaSD")
 
 
     #         Name         pkg-config   libs, include(dir)s
     #         Name         pkg-config   libs, include(dir)s
-    PkgEnable("ARTOOLKIT", "",          ("AR"), "AR/ar.h")
-    PkgEnable("FCOLLADA",  "",          ChooseLib(*fcollada_libs), ("FCollada", "FCollada.h"))
-    PkgEnable("FFMPEG",    ffmpeg_libs, ffmpeg_libs, ffmpeg_libs)
-    PkgEnable("FFTW",      "",          ("fftw", "rfftw"), ("fftw.h", "rfftw.h"))
-    PkgEnable("FMODEX",    "",          ("fmodex"), ("fmodex", "fmodex/fmod.h"))
-    PkgEnable("FREETYPE",  "freetype2", ("freetype"), ("freetype2", "freetype2/freetype/freetype.h"))
-    PkgEnable("GLUT",      "gl",        ("GL"), ("GL/gl.h", "GL/glu.h"), framework = "OpenGL")
-    PkgEnable("GTK2",      "gtk+-2.0")
+    if (not RUNTIME):
+        PkgEnable("ARTOOLKIT", "",          ("AR"), "AR/ar.h")
+        PkgEnable("FCOLLADA",  "",          ChooseLib(*fcollada_libs), ("FCollada", "FCollada.h"))
+        PkgEnable("FFMPEG",    ffmpeg_libs, ffmpeg_libs, ffmpeg_libs)
+        PkgEnable("FFTW",      "",          ("fftw", "rfftw"), ("fftw.h", "rfftw.h"))
+        PkgEnable("FMODEX",    "",          ("fmodex"), ("fmodex", "fmodex/fmod.h"))
+        PkgEnable("FREETYPE",  "freetype2", ("freetype"), ("freetype2", "freetype2/freetype/freetype.h"))
+        PkgEnable("GLUT",      "gl",        ("GL"), ("GL/gl.h", "GL/glu.h"), framework = "OpenGL")
+        PkgEnable("GTK2",      "gtk+-2.0")
+        PkgEnable("NVIDIACG",  "",          ("Cg"), "Cg/cg.h", framework = "Cg")
+        PkgEnable("ODE",       "",          ("ode"), "ode/ode.h")
+        PkgEnable("OPENAL",    "openal",    ("openal"), "AL/al.h", framework = "OpenAL")
+        PkgEnable("OPENCV",    "",          ("cv", "highgui", "cvaux", "ml", "cxcore"), ("opencv", "opencv/cv.h"))
+        PkgEnable("SQUISH",    "",          ("squish"), "squish.h")
+        PkgEnable("TIFF",      "",          ("tiff"), "tiff.h")
+        PkgEnable("VRPN",      "",          ("vrpn", "quat"), ("vrpn", "quat.h", "vrpn/vrpn_Types.h"))
     PkgEnable("JPEG",      "",          ("jpeg"), "jpeglib.h")
     PkgEnable("JPEG",      "",          ("jpeg"), "jpeglib.h")
-    PkgEnable("NVIDIACG",  "",          ("Cg"), "Cg/cg.h", framework = "Cg")
-    PkgEnable("ODE",       "",          ("ode"), "ode/ode.h")
-    PkgEnable("OPENAL",    "openal",    ("openal"), "AL/al.h", framework = "OpenAL")
-    PkgEnable("OPENCV",    "",          ("cv", "highgui", "cvaux", "ml", "cxcore"), ("opencv", "opencv/cv.h"))
     PkgEnable("OPENSSL",   "openssl",   ("ssl", "crypto"), ("openssl/ssl.h", "openssl/crypto.h"))
     PkgEnable("OPENSSL",   "openssl",   ("ssl", "crypto"), ("openssl/ssl.h", "openssl/crypto.h"))
     PkgEnable("PNG",       "libpng",    ("png"), "png.h")
     PkgEnable("PNG",       "libpng",    ("png"), "png.h")
-    PkgEnable("SQUISH",    "",          ("squish"), "squish.h")
-    PkgEnable("TIFF",      "",          ("tiff"), "tiff.h")
     PkgEnable("TINYXML",   "",          ("tinyxml"), "tinyxml.h")
     PkgEnable("TINYXML",   "",          ("tinyxml"), "tinyxml.h")
-    PkgEnable("VRPN",      "",          ("vrpn", "quat"), ("vrpn", "quat.h", "vrpn/vrpn_Types.h"))
     PkgEnable("ZLIB",      "",          ("z"), "zlib.h")
     PkgEnable("ZLIB",      "",          ("z"), "zlib.h")
     if (RTDIST and sys.platform == "darwin" and "PYTHONVERSION" in SDK):
     if (RTDIST and sys.platform == "darwin" and "PYTHONVERSION" in SDK):
         # Don't use the framework for the OSX rtdist build. I'm afraid it gives problems somewhere.
         # Don't use the framework for the OSX rtdist build. I'm afraid it gives problems somewhere.
@@ -426,7 +427,7 @@ if (COMPILER=="LINUX"):
         PkgEnable("WX",    tool = "wx-config")
         PkgEnable("WX",    tool = "wx-config")
     if (RUNTIME):
     if (RUNTIME):
         PkgEnable("NPAPI", "",          (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr/prtypes.h", "nspr"))
         PkgEnable("NPAPI", "",          (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr/prtypes.h", "nspr"))
-    if (sys.platform != "darwin"):
+    if (sys.platform != "darwin" and not RUNTIME):
         # CgGL is covered by the Cg framework, and we don't need X11 components on OSX
         # CgGL is covered by the Cg framework, and we don't need X11 components on OSX
         if (PkgSkip("NVIDIACG")==0):
         if (PkgSkip("NVIDIACG")==0):
             PkgEnable("CGGL",  "",      ("CgGL"), "Cg/cgGL.h")
             PkgEnable("CGGL",  "",      ("CgGL"), "Cg/cgGL.h")