TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

correct reverse alphabetical sort

Browse Source
This commit is contained in:
David Rose 2004-06-12 00:16:06 +00:00
parent ac84758d9d
commit 8f06b1ad29
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/configfiles/Sources.pp
View File

@ -1,5 +1,5 @@
#define INSTALL_CONFIG \ #define INSTALL_CONFIG \
70_direct.prc 40_direct.prc
#if $[CTPROJS] #if $[CTPROJS]
// These files only matter to ctattach users. // These files only matter to ctattach users.
@ -7,4 +7,4 @@
#endif #endif
#include $[THISDIRPREFIX]_direct.prc.pp #include $[THISDIRPREFIX]direct.prc.pp

4
direct/src/configfiles/_direct.prc.pp → direct/src/configfiles/direct.prc.pp
View File

@ -6,7 +6,7 @@
// parameters, in particular the default display types. // parameters, in particular the default display types.
// //
#output 70_direct.prc #output 40_direct.prc
#### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE].
################################# DO NOT EDIT ########################### ################################# DO NOT EDIT ###########################
@ -21,4 +21,4 @@ egg-object-type-direct-widget <Scalar> collide-mask { 0x80000000 } <Collide> {
cull-bin gui-popup 60 unsorted cull-bin gui-popup 60 unsorted
#end 70_direct.prc #end 40_direct.prc

9
dtool/src/dconfig/configTable.cxx
View File

@ -193,10 +193,11 @@ void ConfigTable::ReadConfigFile() {
if (directory.is_directory()) { if (directory.is_directory()) {
vector_string files; vector_string files;
directory.scan_directory(files); directory.scan_directory(files);
// Scan the files in alphabetical order, so that the // Scan the files into reverse alphabetical order, to re-invert
// alphabetically last file has precedence. // the native Config sorting, so that the alphabetically last
for (vector_string::iterator fi = files.begin(); // file has precedence.
fi != files.end(); for (vector_string::reverse_iterator fi = files.rbegin();
fi != files.rend();
++fi) { ++fi) {
bool matches = false; bool matches = false;
for (Globs::const_iterator gi = configname.begin(); for (Globs::const_iterator gi = configname.begin();

4
panda/src/configfiles/Sources.pp
View File

@ -1,6 +1,6 @@
#define INSTALL_CONFIG \ #define INSTALL_CONFIG \
panda.emacs panda.emacs.Xdefaults 80_panda.prc panda.emacs panda.emacs.Xdefaults 20_panda.prc
#if $[CTPROJS] #if $[CTPROJS]
@ -9,4 +9,4 @@
#endif #endif
#include $[THISDIRPREFIX]_panda.prc.pp #include $[THISDIRPREFIX]panda.prc.pp

8
panda/src/configfiles/_panda.prc.pp → panda/src/configfiles/panda.prc.pp
View File

@ -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 // ppremake time. This is intended to fill in some of the default
// parameters, in particular the default display types. // parameters, in particular the default display types.
// //
#output 80_panda.prc #output 20_panda.prc
#### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE].
################################# DO NOT EDIT ########################### ################################# DO NOT EDIT ###########################
@ -57,4 +57,4 @@ load-file-type egg pandaegg
egg-object-type-portal <Scalar> portal { 1 } egg-object-type-portal <Scalar> portal { 1 }
egg-object-type-polylight <Scalar> polylight { 1 } egg-object-type-polylight <Scalar> polylight { 1 }
#end 80_panda.prc #end 20_panda.prc

4
pandatool/src/configfiles/Sources.pp
View File

@ -1,6 +1,6 @@
#define INSTALL_CONFIG \ #define INSTALL_CONFIG \
72_pandatool.prc 30_pandatool.prc
#if $[CTPROJS] #if $[CTPROJS]
// These files only matter to ctattach users. // These files only matter to ctattach users.
@ -8,4 +8,4 @@
#endif #endif
#include $[THISDIRPREFIX]_pandatool.prc.pp #include $[THISDIRPREFIX]pandatool.prc.pp

6
pandatool/src/configfiles/_pandatool.prc.pp → pandatool/src/configfiles/pandatool.prc.pp
View File

@ -1,11 +1,11 @@
// //
// _pandatool.prc.pp // pandatool.prc.pp
// //
// This file defines the script to auto-generate _pandatool.prc at // This file defines the script to auto-generate _pandatool.prc at
// ppremake time. // ppremake time.
// //
#output 72_pandatool.prc #output 30_pandatool.prc
#### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE].
################################# DO NOT EDIT ########################### ################################# DO NOT EDIT ###########################
@ -18,4 +18,4 @@
load-file-type ptloader load-file-type ptloader
#end 72_pandatool.prc #end 30_pandatool.prc