Skip to content

Commit

Permalink
ref edbee#14, MinGW compatibility: Disabled memoryLeak detection and …
Browse files Browse the repository at this point in the history
…fixed mingw compilation (different library-name is generated for mingw)
  • Loading branch information
gamecreature committed May 29, 2017
1 parent 4f106d2 commit 67385cb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion edbee-lib/edbee/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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( ) )
Expand Down
9 changes: 6 additions & 3 deletions edbee-test/edbee-test.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 67385cb

Please sign in to comment.