Showing the changes to src/core/util_string.cpp (1 of 1 file). Show all
Unified · Split
| @@ -366,7 +366,7 @@ done: · 365 unmodified lines | |||
| 366 | 366 | ||
| 367 | 367 | ||
| 368 | /* from http://developer.apple.com/library/mac/#qa/qa1549/_index.html */ | 368 | /* from http://developer.apple.com/library/mac/#qa/qa1549/_index.html */ |
| 369 | #if !defined(__PLATFORM_WIN32__) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) | 369 | #if !defined(__PLATFORM_WIN32__) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !defined(__CHIP_MODE__) |
| 370 | 370 | ||
| 371 | #include <wordexp.h> | 371 | #include <wordexp.h> |
| 372 | //----------------------------------------------------------------------------- | 372 | //----------------------------------------------------------------------------- |
| @@ -455,7 +455,7 @@ std::string globTildePath( const std::string & path ) · 82 unmodified lines | |||
| 455 | // | 455 | // |
| 456 | // return result; | 456 | // return result; |
| 457 | //} | 457 | //} |
| 458 | #endif // __PLATFORM_WIN32__ && __EMSCRIPTEN__ && __ANDROID__ | 458 | #endif // not __PLATFORM_WIN32__ && __EMSCRIPTEN__ && __ANDROID__ && __CHIP_MODE__ |
| 459 | 459 | ||
| 460 | 460 | ||
| 461 | 461 | ||
| @@ -506,8 +506,8 @@ std::string get_full_path( const std::string & fp ) · 44 unmodified lines | |||
| 506 | //----------------------------------------------------------------------------- | 506 | //----------------------------------------------------------------------------- |
| 507 | std::string expand_filepath( std::string & fp, t_CKBOOL ensurePathExists ) | 507 | std::string expand_filepath( std::string & fp, t_CKBOOL ensurePathExists ) |
| 508 | { | 508 | { |
| 509 | #if defined(__PLATFORM_WIN32__) || defined(__EMSCRIPTEN__) || defined(__ANDROID__) | 509 | #if defined(__PLATFORM_WIN32__) || defined(__EMSCRIPTEN__) || defined(__ANDROID__) || defined(__CHIP_MODE__) |
| 510 | // no expansion in Windows systems or Emscripten or Android | 510 | // no expansion in Windows systems or Emscripten or Android or iOS |
| 511 | return fp; | 511 | return fp; |
| 512 | #else | 512 | #else |
| 513 | // expand ~ to full path | 513 | // expand ~ to full path |