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

fix slashes here and there

Browse Source
This commit is contained in:
David Rose 2002-05-23 16:11:36 +00:00
parent d39fb3d965
commit b77ce1fddb
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ppremake/ppScope.cxx
View File

@ -47,7 +47,7 @@ PPScope::MapVariableDefinition PPScope::_null_map_def;
PPScope::ScopeStack PPScope::_scope_stack; PPScope::ScopeStack PPScope::_scope_stack;
#ifdef __CYGWIN__ #ifdef PLATFORM_CYGWIN
extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32); extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32);
extern "C" void cygwin_conv_to_posix_path(const char *path, char *posix); extern "C" void cygwin_conv_to_posix_path(const char *path, char *posix);
#endif #endif
@ -1215,22 +1215,27 @@ expand_unixfilename(const string &params) {
// been compiled with Cygwin; it is thus equivalent to // been compiled with Cygwin; it is thus equivalent to
// the result of the cygpath -w command. // the result of the cygpath -w command.
// //
// When ppremake has not been compiled with Cygwin, this // When Cygwin is not available, this returns the same
// returns the same as the "osfilename" variable. // as the "osfilename" variable.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
string PPScope:: string PPScope::
expand_cygpath_w(const string &params) { expand_cygpath_w(const string &params) {
string filename = trim_blanks(expand_string(params)); string filename = trim_blanks(expand_string(params));
#ifdef __CYGWIN__ #ifdef PLATFORM_CYGWIN
char result[4096]; char result[4096];
// In Win32, we're either running Cygwin, in which case this
// function is statically linked in and definitely non-NULL, or
// we're running native Win32, in which case this function may or
// may not have been dynamically linked in. In either case, use it
// if we've got it.
cygwin_conv_to_win32_path(filename.c_str(), result); cygwin_conv_to_win32_path(filename.c_str(), result);
filename = result; filename = result;
#else #else
Filename fn(filename); Filename fn(filename);
filename = fn.to_os_specific(); filename = fn.to_os_specific();
#endif #endif // PLATFORM_CYGWIN
return filename; return filename;
} }
@ -1245,21 +1250,21 @@ expand_cygpath_w(const string &params) {
// been compiled with Cygwin; it is thus equivalent to // been compiled with Cygwin; it is thus equivalent to
// the result of the cygpath -p command. // the result of the cygpath -p command.
// //
// When ppremake has not been compiled with Cygwin, this // When Cygwin is not available, this returns the same
// returns the same as the "unixfilename" variable. // as the "unixfilename" variable.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
string PPScope:: string PPScope::
expand_cygpath_p(const string &params) { expand_cygpath_p(const string &params) {
string filename = trim_blanks(expand_string(params)); string filename = trim_blanks(expand_string(params));
#ifdef __CYGWIN__ #ifdef PLATFORM_CYGWIN
char result[4096]; char result[4096];
cygwin_conv_to_posix_path(filename.c_str(), result); cygwin_conv_to_posix_path(filename.c_str(), result);
filename = result; filename = result;
#else #else
filename = Filename::from_os_specific(filename); filename = Filename::from_os_specific(filename);
#endif #endif // PLATFORM_CYGWIN
return filename; return filename;
} }
@ -1365,13 +1370,19 @@ expand_libtest(const string &params) {
#ifdef WIN32 #ifdef WIN32
const char *windir = getenv("WINDIR"); const char *windir = getenv("WINDIR");
if (windir != (const char *)NULL) { if (windir != (const char *)NULL) {
directories.append_directory(Filename(windir, "System")); Filename windir_filename = Filename::from_os_specific(windir);
directories.append_directory(Filename(windir, "System32")); directories.append_directory(Filename(windir_filename, "System"));
directories.append_directory(Filename(windir_filename, "System32"));
} }
const char *lib = getenv("LIB"); const char *lib = getenv("LIB");
if (lib != (const char *)NULL) { if (lib != (const char *)NULL) {
directories.append_path(lib, ";"); vector<string> lib_dirs;
tokenize(lib, lib_dirs, ";");
vector<string>::const_iterator li;
for (li = lib_dirs.begin(); li != lib_dirs.end(); ++li) {
directories.append_directory(Filename::from_os_specific(*li));
}
} }
#endif #endif
@ -1468,8 +1479,14 @@ expand_bintest(const string &params) {
#ifdef WIN32 #ifdef WIN32
if (pathvar.find(';') != string::npos) { if (pathvar.find(';') != string::npos) {
// If the path contains semicolons, it's a native Windows-style // If the path contains semicolons, it's a native Windows-style
// path: split it up based on semicolons. // path: split it up based on semicolons, and convert each
directories.append_path(pathvar, ";"); // directory from windows form.
vector<string> path_dirs;
tokenize(path, path_dirs, ";");
vector<string>::const_iterator pi;
for (pi = path_dirs.begin(); pi != path_dirs.end(); ++pi) {
directories.append_directory(Filename::from_os_specific(*pi));
}
} else { } else {
// Otherwise, assume it's a Cygwin-style path: split it up based // Otherwise, assume it's a Cygwin-style path: split it up based