# HG changeset patch
# User joachim99
# Date 1274121351 0
# Node ID f0c42ddbbda42dda9644f51902530e1594b36b99
# Parent  236f1c9c3fbf9607a5fa7505019fcb6f8b33e7a5
Fixed compilation for windows.

diff -r 236f1c9c3fbf -r f0c42ddbbda4 kdiff3/src-QT4/kdiff3.pro
--- 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
    }
diff -r 236f1c9c3fbf -r f0c42ddbbda4 kdiff3/src-QT4/kreplacements/kreplacements.cpp
--- a/kdiff3/src-QT4/kreplacements/kreplacements.cpp	Sat May 15 20:36:52 2010 +0000
+++ b/kdiff3/src-QT4/kreplacements/kreplacements.cpp	Mon May 17 18:35:51 2010 +0000
@@ -79,6 +79,7 @@
       }
 
 #ifndef Q_OS_OS2
+      char buf[256];
       HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf );
       if ( int(hi)<=32 )
       {
@@ -1069,8 +1070,8 @@
             int len = pos==-1 ? optName.length() : pos;
             int len2 = arg.length();
 
-            if( len>0 && ( arg[1]=='-' && len2-2==len && optName.left(len) ==  arg.mid(2,len) ||
-                                          len2-1==len && optName.left(len) ==  arg.mid(1,len) ))
+            if( len>0 && ( (arg[1]=='-' && len2-2==len && optName.left(len) ==  arg.mid(2,len)) ||
+                                          (len2-1==len && optName.left(len) ==  arg.mid(1,len)) ))
             {
                if (s_options[j].description == 0)  // alias, because without description.
                {
diff -r 236f1c9c3fbf -r f0c42ddbbda4 kdiff3/src-QT4/version.h
--- a/kdiff3/src-QT4/version.h	Sat May 15 20:36:52 2010 +0000
+++ b/kdiff3/src-QT4/version.h	Mon May 17 18:35:51 2010 +0000
@@ -1,2 +1,2 @@
 #undef VERSION
-#define VERSION "0.9.95"
+#define VERSION "0.9.96a"