Commit 5e78d00d authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed completly broken paths for plugin loading with qmake

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5671 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 35ed986a
...@@ -103,7 +103,7 @@ void Core::applyOptions(){ ...@@ -103,7 +103,7 @@ void Core::applyOptions(){
//hideToolbox //hideToolbox
if (OpenFlipper::Options::hideToolbox()) { if (OpenFlipper::Options::hideToolbox()) {
coreWidget_->showToolbox (false); coreWidget_->showToolbox (false);
} }
...@@ -176,30 +176,29 @@ void Core::setupOptions() { ...@@ -176,30 +176,29 @@ void Core::setupOptions() {
#else #else
tempDir.cd("Plugins"); tempDir.cd("Plugins");
///@todo do not check WIN32 Only #if defined(WIN32)
tempDir.cd("Windows");
#elif defined(ARCH_DARWIN)
tempDir.cd("Darwin");
#else
tempDir.cd("Linux");
#endif
if ( OpenFlipper::Options::is64bit() ) if ( OpenFlipper::Options::is64bit() )
tempDir.cd("64"); tempDir.cd("64");
else
if ( OpenFlipper::Options::is32bit() ) tempDir.cd("32");
#ifdef WIN32
tempDir.cd("win32");
#else
tempDir.cd("32");
#endif
#ifdef WIN32 #ifdef WIN32
#ifdef NDEBUG #ifndef NDEBUG
tempDir.cd("Release"); #define DEBUG
#else
tempDir.cd("Debug");
#endif #endif
#endif
#ifdef DEBUG
tempDir.cd("Debug");
#else #else
#ifdef DEBUG tempDir.cd("Release");
tempDir.cd("dbg");
#else
tempDir.cd("max");
#endif
#endif #endif
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment