diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 7fc8b0f258..d095c5c874 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1000,6 +1000,7 @@ DTOOL_CONFIG=[ ("HAVE_UCONTEXT_H", 'UNDEF', '1'), ("HAVE_RTTI", '1', '1'), ("HAVE_X11", 'UNDEF', '1'), + ("HAVE_XF86DGA", 'UNDEF', '1'), ("IS_LINUX", 'UNDEF', '1'), ("IS_OSX", 'UNDEF', 'UNDEF'), ("GLOBAL_OPERATOR_NEW_EXCEPTIONS", 'UNDEF', '1'), @@ -1096,6 +1097,7 @@ def WriteConfigSettings(): dtool_config["HAVE_SYS_MALLOC_H"] = '1' dtool_config["HAVE_OPENAL_FRAMEWORK"] = '1' dtool_config["HAVE_X11"] = 'UNDEF' # We might have X11, but we don't need it. + dtool_config["HAVE_XF86DGA"] = 'UNDEF' dtool_config["IS_LINUX"] = 'UNDEF' dtool_config["IS_OSX"] = '1' dtool_config["HAVE_PROC_SELF_EXE"] = 'UNDEF' @@ -1127,7 +1129,10 @@ def WriteConfigSettings(): if (PkgSkip("PLUGIN")==0): #FIXME: do this at runtime or so. - plugin_config["P3D_PLUGIN_DOWNLOAD"] = "file://C:\\p3dstage" + if (sys.platform == "win32"): + plugin_config["P3D_PLUGIN_DOWNLOAD"] = "file://C:\\p3dstage" + else: + plugin_config["P3D_PLUGIN_DOWNLOAD"] = "/p3dstage" plugin_config["P3D_PLUGIN_LOGFILE1"] = "" plugin_config["P3D_PLUGIN_LOGFILE2"] = "" plugin_config["P3D_PLUGIN_P3D_PLUGIN"] = ""