diff --git a/direct/src/configfiles/Sources.pp b/direct/src/configfiles/Sources.pp index 49509a6afe..40e93e6d88 100644 --- a/direct/src/configfiles/Sources.pp +++ b/direct/src/configfiles/Sources.pp @@ -1,5 +1,5 @@ #define INSTALL_CONFIG \ - 70_direct.prc + 40_direct.prc #if $[CTPROJS] // These files only matter to ctattach users. @@ -7,4 +7,4 @@ #endif -#include $[THISDIRPREFIX]_direct.prc.pp +#include $[THISDIRPREFIX]direct.prc.pp diff --git a/direct/src/configfiles/_direct.prc.pp b/direct/src/configfiles/direct.prc.pp similarity index 94% rename from direct/src/configfiles/_direct.prc.pp rename to direct/src/configfiles/direct.prc.pp index 972143ae16..cf29d2deb4 100644 --- a/direct/src/configfiles/_direct.prc.pp +++ b/direct/src/configfiles/direct.prc.pp @@ -6,7 +6,7 @@ // parameters, in particular the default display types. // -#output 70_direct.prc +#output 40_direct.prc #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. ################################# DO NOT EDIT ########################### @@ -21,4 +21,4 @@ egg-object-type-direct-widget collide-mask { 0x80000000 } { cull-bin gui-popup 60 unsorted -#end 70_direct.prc +#end 40_direct.prc diff --git a/dtool/src/dconfig/configTable.cxx b/dtool/src/dconfig/configTable.cxx index aa9296be3b..80d76f90ee 100644 --- a/dtool/src/dconfig/configTable.cxx +++ b/dtool/src/dconfig/configTable.cxx @@ -193,10 +193,11 @@ void ConfigTable::ReadConfigFile() { if (directory.is_directory()) { vector_string files; directory.scan_directory(files); - // Scan the files in alphabetical order, so that the - // alphabetically last file has precedence. - for (vector_string::iterator fi = files.begin(); - fi != files.end(); + // Scan the files into reverse alphabetical order, to re-invert + // the native Config sorting, so that the alphabetically last + // file has precedence. + for (vector_string::reverse_iterator fi = files.rbegin(); + fi != files.rend(); ++fi) { bool matches = false; for (Globs::const_iterator gi = configname.begin(); diff --git a/panda/src/configfiles/Sources.pp b/panda/src/configfiles/Sources.pp index cf3d7a21d8..df0d016b2f 100644 --- a/panda/src/configfiles/Sources.pp +++ b/panda/src/configfiles/Sources.pp @@ -1,6 +1,6 @@ #define INSTALL_CONFIG \ - panda.emacs panda.emacs.Xdefaults 80_panda.prc + panda.emacs panda.emacs.Xdefaults 20_panda.prc #if $[CTPROJS] @@ -9,4 +9,4 @@ #endif -#include $[THISDIRPREFIX]_panda.prc.pp +#include $[THISDIRPREFIX]panda.prc.pp diff --git a/panda/src/configfiles/_panda.prc.pp b/panda/src/configfiles/panda.prc.pp similarity index 93% rename from panda/src/configfiles/_panda.prc.pp rename to panda/src/configfiles/panda.prc.pp index 0e8bb22137..d7c349ee32 100644 --- a/panda/src/configfiles/_panda.prc.pp +++ b/panda/src/configfiles/panda.prc.pp @@ -1,12 +1,12 @@ // -// _panda.prc.pp +// panda.prc.pp // -// This file defines the script to auto-generate _panda.prc at +// This file defines the script to auto-generate panda.prc at // ppremake time. This is intended to fill in some of the default // parameters, in particular the default display types. // -#output 80_panda.prc +#output 20_panda.prc #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. ################################# DO NOT EDIT ########################### @@ -57,4 +57,4 @@ load-file-type egg pandaegg egg-object-type-portal portal { 1 } egg-object-type-polylight polylight { 1 } -#end 80_panda.prc +#end 20_panda.prc diff --git a/pandatool/src/configfiles/Sources.pp b/pandatool/src/configfiles/Sources.pp index 42f2901c27..34420b6967 100644 --- a/pandatool/src/configfiles/Sources.pp +++ b/pandatool/src/configfiles/Sources.pp @@ -1,6 +1,6 @@ #define INSTALL_CONFIG \ - 72_pandatool.prc + 30_pandatool.prc #if $[CTPROJS] // These files only matter to ctattach users. @@ -8,4 +8,4 @@ #endif -#include $[THISDIRPREFIX]_pandatool.prc.pp +#include $[THISDIRPREFIX]pandatool.prc.pp diff --git a/pandatool/src/configfiles/_pandatool.prc.pp b/pandatool/src/configfiles/pandatool.prc.pp similarity index 89% rename from pandatool/src/configfiles/_pandatool.prc.pp rename to pandatool/src/configfiles/pandatool.prc.pp index be13d70497..24f4fd81db 100644 --- a/pandatool/src/configfiles/_pandatool.prc.pp +++ b/pandatool/src/configfiles/pandatool.prc.pp @@ -1,11 +1,11 @@ // -// _pandatool.prc.pp +// pandatool.prc.pp // // This file defines the script to auto-generate _pandatool.prc at // ppremake time. // -#output 72_pandatool.prc +#output 30_pandatool.prc #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. ################################# DO NOT EDIT ########################### @@ -18,4 +18,4 @@ load-file-type ptloader -#end 72_pandatool.prc +#end 30_pandatool.prc