Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/kdiff3.pro @ 95:6f42f5bd218e
- OS2-port by Silvan Scherrer
- Fixed writing to KIO.
- Fix crash on A/B-overview (infinite recursion)
author | joachim99 |
---|---|
date | Sun, 28 Feb 2010 20:32:34 +0000 |
parents | fcd146072e0c |
children | f0c42ddbbda4 |
comparison
equal
deleted
inserted
replaced
94:b2f22ae5f810 | 95:6f42f5bd218e |
---|---|
1 TEMPLATE = app | 1 TEMPLATE = app |
2 # When unresolved items remain during linking: Try adding "shared" in the CONFIG. | 2 # When unresolved items remain during linking: Try adding "shared" in the CONFIG. |
3 CONFIG += qt warn_on thread precompile_header | 3 CONFIG += qt warn_on thread precompile_header |
4 PRECOMPILED_HEADER = stable.h | 4 !os2:PRECOMPILED_HEADER = stable.h |
5 HEADERS = version.h \ | 5 HEADERS = version.h \ |
6 diff.h \ | 6 diff.h \ |
7 difftextwindow.h \ | 7 difftextwindow.h \ |
8 mergeresultwindow.h \ | 8 mergeresultwindow.h \ |
9 kdiff3.h \ | 9 kdiff3.h \ |
51 QMAKE_LFLAGS += -luser32 -lshell32 | 51 QMAKE_LFLAGS += -luser32 -lshell32 |
52 } else { | 52 } else { |
53 QMAKE_LFLAGS += user32.lib shell32.lib | 53 QMAKE_LFLAGS += user32.lib shell32.lib |
54 } | 54 } |
55 } | 55 } |
56 | 56 os2 { |
57 RC_FILE = kdiff3os2.rc | |
58 } | |
57 | 59 |
58 unix { | 60 unix { |
59 documentation.path = /usr/local/share/doc/kdiff3 | 61 documentation.path = /usr/local/share/doc/kdiff3 |
60 documentation.files = ../doc/* | 62 documentation.files = ../doc/* |
61 | 63 |