From 0d8b31f9a47bf5eb1c52e24bf54e0598f2bcff10 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 11 Jun 2010 22:36:54 +0000 Subject: [PATCH] make local_dev a runtime default, not a compiled default --- dtool/Config.pp | 2 +- dtool/src/prc/configPageManager.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 96a555f107..60fcca0cf8 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -256,7 +256,7 @@ // You may define both of these to build or develop the Panda3D // rtdist, the environment packaged up for distribution with the // plugin. -#define PANDA_PACKAGE_VERSION local_dev +//#define PANDA_PACKAGE_VERSION local_dev //#define PANDA_PACKAGE_HOST_URL http://some.url/ #defer HAVE_P3D_RTDIST $[PANDA_PACKAGE_HOST_URL] diff --git a/dtool/src/prc/configPageManager.cxx b/dtool/src/prc/configPageManager.cxx index 6752f111f4..535e32db3e 100644 --- a/dtool/src/prc/configPageManager.cxx +++ b/dtool/src/prc/configPageManager.cxx @@ -664,7 +664,7 @@ config_initialized() { #ifndef NDEBUG ConfigVariableString panda_package_version - ("panda-package-version", "", + ("panda-package-version", "local_dev", PRC_DESC("This can be used to specify the value returned by " "PandaSystem::get_package_version_str(), in development mode only, " "and only if another value has not already been compiled in. This " @@ -673,7 +673,7 @@ config_initialized() { ConfigVariableString panda_package_host_url ("panda-package-host-url", "", PRC_DESC("This can be used to specify the value returned by " - "PandaSystem::get_package_url_url(), in development mode only, " + "PandaSystem::get_package_host_url(), in development mode only, " "and only if another value has not already been compiled in. This " "is intended for developer convenience, to masquerade a development " "build of Panda as a different runtime version. Use with caution."));