Commit e465595d authored by Joachim Eibl's avatar Joachim Eibl

Fixed compilation for windows.

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@103 c8aa9fed-2811-0410-8543-893ada326672
parent d1ccf55c
......@@ -49,6 +49,9 @@ win32 {
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
}
......
......@@ -79,6 +79,7 @@ static void showHelp()
}
#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 @@ KApplication::KApplication()
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.
{
......
#undef VERSION
#define VERSION "0.9.95"
#define VERSION "0.9.96a"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment