Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/kdiff3.pro @ 99:f0c42ddbbda4
Fixed compilation for windows.
author | joachim99 |
---|---|
date | Mon, 17 May 2010 18:35:51 +0000 |
parents | 6f42f5bd218e |
children | 2df4daf33fbd 44fa471eb3c4 |
comparison
equal
deleted
inserted
replaced
98:236f1c9c3fbf | 99:f0c42ddbbda4 |
---|---|
47 QMAKE_CXXFLAGS_DEBUG += -DQT_NO_ASCII_CAST | 47 QMAKE_CXXFLAGS_DEBUG += -DQT_NO_ASCII_CAST |
48 QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DQT_NO_ASCII_CAST | 48 QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DQT_NO_ASCII_CAST |
49 RC_FILE = kdiff3win.rc | 49 RC_FILE = kdiff3win.rc |
50 win32-g++ { | 50 win32-g++ { |
51 QMAKE_LFLAGS += -luser32 -lshell32 | 51 QMAKE_LFLAGS += -luser32 -lshell32 |
52 QMAKE_LFLAGS_RELEASE += -static-libgcc # Remove dependency to libgcc_s_dw2-1.dll | |
53 QMAKE_LFLAGS_EXCEPTIONS_ON -= -mthreads # Remove dependency to mingwm10.dll (hack, yet no problem if not multithreaded) | |
54 # Better: configure -static -release -no-exceptions -fast | |
52 } else { | 55 } else { |
53 QMAKE_LFLAGS += user32.lib shell32.lib | 56 QMAKE_LFLAGS += user32.lib shell32.lib |
54 } | 57 } |
55 } | 58 } |
56 os2 { | 59 os2 { |