Mercurial > hg > easyhg-kdiff3

diff kdiff3/src-QT4/kdiff3.pro @ 99:f0c42ddbbda4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed compilation for windows.
author joachim99
date Mon, 17 May 2010 18:35:51 +0000
parents 6f42f5bd218e
children 2df4daf33fbd 44fa471eb3c4
line wrap: on
line diff
--- a/kdiff3/src-QT4/kdiff3.pro	Sat May 15 20:36:52 2010 +0000
+++ b/kdiff3/src-QT4/kdiff3.pro	Mon May 17 18:35:51 2010 +0000
@@ -49,6 +49,9 @@
    RC_FILE = kdiff3win.rc
    win32-g++ {
            QMAKE_LFLAGS += -luser32 -lshell32
+           QMAKE_LFLAGS_RELEASE += -static-libgcc  # Remove dependency to libgcc_s_dw2-1.dll
+           QMAKE_LFLAGS_EXCEPTIONS_ON -= -mthreads # Remove dependency to mingwm10.dll (hack, yet no problem if not multithreaded)
+                                                   # Better: configure -static -release -no-exceptions -fast
    } else {
            QMAKE_LFLAGS += user32.lib shell32.lib
    }