From 014fb04daf1ce3ed54e2e0afbce8b582c61acbae Mon Sep 17 00:00:00 2001 From: mfreiholz Date: Wed, 24 Feb 2016 17:39:35 +0100 Subject: [PATCH] Linux fixes. --- AdvancedDockingSystem/include/ads/API.h | 2 ++ .../AdvancedDockingSystemDemo.pro | 28 +++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/AdvancedDockingSystem/include/ads/API.h b/AdvancedDockingSystem/include/ads/API.h index 83ec317..9714863 100644 --- a/AdvancedDockingSystem/include/ads/API.h +++ b/AdvancedDockingSystem/include/ads/API.h @@ -14,6 +14,8 @@ class QSplitter; #else #define ADS_EXPORT_API __declspec(dllimport) #endif +#else + #define ADS_EXPORT_API #endif // Use namespace diff --git a/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro b/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro index 902f058..57ccba1 100644 --- a/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro +++ b/AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro @@ -33,23 +33,23 @@ FORMS += \ # Dependency: AdvancedDockingSystem (staticlib) -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/release/ -lAdvancedDockingSystem -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem -else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem - -INCLUDEPATH += $$PWD/../AdvancedDockingSystem/include -DEPENDPATH += $$PWD/../AdvancedDockingSystem/include - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/release/libAdvancedDockingSystem.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/debug/libAdvancedDockingSystem.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/release/AdvancedDockingSystem.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/debug/AdvancedDockingSystem.lib -else:unix: PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/libAdvancedDockingSystem.a - -# Dependency: AdvancedDockingSystem (shared) #win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/release/ -lAdvancedDockingSystem #else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem #else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem #INCLUDEPATH += $$PWD/../AdvancedDockingSystem/include #DEPENDPATH += $$PWD/../AdvancedDockingSystem/include + +#win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/release/libAdvancedDockingSystem.a +#else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/debug/libAdvancedDockingSystem.a +#else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/release/AdvancedDockingSystem.lib +#else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/debug/AdvancedDockingSystem.lib +#else:unix: PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/libAdvancedDockingSystem.a + +# Dependency: AdvancedDockingSystem (shared) +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/release/ -lAdvancedDockingSystem +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem +else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem + +INCLUDEPATH += $$PWD/../AdvancedDockingSystem/include +DEPENDPATH += $$PWD/../AdvancedDockingSystem/include