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

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2000-11-16 03:47:03 +00:00
parent bc583add45
commit ff199787ff
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ppremake/configure.in
View File

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(ppremake.cxx) AC_INIT(ppremake.cxx)
AM_INIT_AUTOMAKE(ppremake, 0.57) AM_INIT_AUTOMAKE(ppremake, 0.58)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_PREFIX_DEFAULT(/usr/local/panda) AC_PREFIX_DEFAULT(/usr/local/panda)

8
ppremake/ppScope.cxx
View File

@ -2703,10 +2703,13 @@ expand_dependencies(const string &params) {
vector<string> filenames; vector<string> filenames;
tokenize_whitespace(expand_string(params), filenames); tokenize_whitespace(expand_string(params), filenames);
PPDirectory *directory = get_directory();
assert(directory != (PPDirectory *)NULL);
vector<string> results; vector<string> results;
vector<string>::const_iterator fi; vector<string>::const_iterator fi;
for (fi = filenames.begin(); fi != filenames.end(); ++fi) { for (fi = filenames.begin(); fi != filenames.end(); ++fi) {
PPDependableFile *file = _directory->get_dependable_file(*fi, false); PPDependableFile *file = directory->get_dependable_file(*fi, false);
assert(file != (PPDependableFile *)NULL); assert(file != (PPDependableFile *)NULL);
vector<PPDependableFile *> files; vector<PPDependableFile *> files;
@ -2722,6 +2725,9 @@ expand_dependencies(const string &params) {
} }
} }
sort(results.begin(), results.end());
results.erase(unique(results.begin(), results.end()), results.end());
string result = repaste(results, " "); string result = repaste(results, " ");
return result; return result;
} }