From 67385cb96d6bc237128d01c1fb233822888c735b Mon Sep 17 00:00:00 2001 From: Rick Blommers Date: Mon, 29 May 2017 21:59:06 +0200 Subject: [PATCH] ref #14, MinGW compatibility: Disabled memoryLeak detection and fixed mingw compilation (different library-name is generated for mingw) --- CHANGELOG.md | 1 + edbee-lib/edbee/debug.h | 2 +- edbee-test/edbee-test.pro | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b88a868..86a8d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ edbee.lib: +- fix #14, MinGW compatibility: Disabled memoryLeak detection and fixed mingw compilation (different library-name is generated for mingw) - fix #13, Added a method to disable the scrollarea shadows: widget->textScrollArea()->enableShadowWidget(bool) - fix #9, Updated onigmo library. Fixes compilation/linkage issue on Mac OS X (enc/windows_31j.c) - fix, Fixed build warnings via een #pragma for the onig library. (When updating vendor/onig, include "config-onig-edbee.h" in "config.h") diff --git a/edbee-lib/edbee/debug.h b/edbee-lib/edbee/debug.h index 462d773..9b480cf 100644 --- a/edbee-lib/edbee/debug.h +++ b/edbee-lib/edbee/debug.h @@ -7,7 +7,7 @@ #include "edbee/util/logging.h" -#ifdef QT_DEBUG +#if defined(QT_DEBUG) && !defined(__MINGW32__) #include "edbee/util/mem/debug_new.h" /// This assert requires the inclusion of QApplication an QThread #define Q_ASSERT_GUI_THREAD Q_ASSERT( qApp->thread() == QThread::currentThread( ) ) diff --git a/edbee-test/edbee-test.pro b/edbee-test/edbee-test.pro index c5e0dcd..d258656 100644 --- a/edbee-test/edbee-test.pro +++ b/edbee-test/edbee-test.pro @@ -106,7 +106,10 @@ else:unix:!symbian: LIBS += -L$$OUT_PWD/../edbee-lib/ -ledbee INCLUDEPATH += $$PWD/../edbee-lib DEPENDPATH += $$PWD/../edbee-lib -win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../edbee-lib/release/edbee.lib -else:win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../edbee-lib/debug/edbee.lib -else:unix:!symbian: PRE_TARGETDEPS += $$OUT_PWD/../edbee-lib/libedbee.a +win32-msvc*:LIBNAME=edbee.lib +else:LIBNAME=libedbee.a + +win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../edbee-lib/release/$$LIBNAME +else:win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../edbee-lib/debug/$$LIBNAME +else:unix:!symbian: PRE_TARGETDEPS += $$OUT_PWD/../edbee-lib/$$LIBNAME