From dcebac87b9756fcc3d338ca7a61db306caeb5ba1 Mon Sep 17 00:00:00 2001 From: jtaylor2 Date: Sat, 31 Oct 2015 10:22:11 -0400 Subject: [PATCH] Remove __CYGWIN__ from Issue 3012 Windows pathing fix because Cygwin uses posix pathing and not Windows pathing. --- companion/src/simulation/simulatorinterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/simulation/simulatorinterface.cpp b/companion/src/simulation/simulatorinterface.cpp index abf666afe..641ce188b 100644 --- a/companion/src/simulation/simulatorinterface.cpp +++ b/companion/src/simulation/simulatorinterface.cpp @@ -53,7 +53,7 @@ void registerSimulators() if (!simulatorsFound) { #if defined(__APPLE__) dir = QLibraryInfo::location(QLibraryInfo::PrefixPath) + "/Resources"; -#elif (!defined __GNUC__) || (defined __CYGWIN__) +#elif (!defined __GNUC__) char name[MAX_PATH]; GetModuleFileName(NULL, name, MAX_PATH); QString path(name); @@ -93,4 +93,4 @@ void unregisterSimulators() foreach(SimulatorFactory *factory, registered_simulators) { delete factory; } -} \ No newline at end of file +}