Commit 3537050fbca64838a1d5db47c5fbd17dcdcabf90
1 parent
a6601774
don't check DISPLAY on __APPLE__ machines
Showing
1 changed file
with
5 additions
and
1 deletions
openbr/openbr_plugin.cpp
| @@ -1072,9 +1072,13 @@ void br::Context::initialize(int &argc, char *argv[], QString sdkPath, bool useG | @@ -1072,9 +1072,13 @@ void br::Context::initialize(int &argc, char *argv[], QString sdkPath, bool useG | ||
| 1072 | 1072 | ||
| 1073 | QString sep; | 1073 | QString sep; |
| 1074 | #ifndef _WIN32 | 1074 | #ifndef _WIN32 |
| 1075 | + #ifndef __APPLE__ | ||
| 1076 | + // Modern OS X will only define the DISPLAY environment variable if XQuartz | ||
| 1077 | + // is installed, so we only do this check on non-Apple Unix systems. | ||
| 1075 | useGui = useGui && (getenv("DISPLAY") != NULL); | 1078 | useGui = useGui && (getenv("DISPLAY") != NULL); |
| 1079 | + #endif // __APPLE__ | ||
| 1076 | sep = ":"; | 1080 | sep = ":"; |
| 1077 | -#else | 1081 | +#else // _WIN32 |
| 1078 | sep = ";"; | 1082 | sep = ";"; |
| 1079 | #endif // not _WIN32 | 1083 | #endif // not _WIN32 |
| 1080 | 1084 |