Fix MinGW based build

Changes:
- fix src/jomlib/jobserver.cpp for 64bit build;
- rename files src/jomlib/processXXX -> src/jomlib/jomprocessXXX;
- fix CMake and QMake projects to build with MinGW.

Task-number: QTCREATORBUG-17709
Change-Id: Ib88659f991cec3b50d29e0035aba6fe383c5e21a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

7 files changed, 19 insertions, 11 deletions

diff --git a/src/jomlib/commandexecutor.h b/src/jomlib/commandexecutor.h
index 74529f7..04b01e1 100644
--- a/src/jomlib/commandexecutor.h
+++ b/src/jomlib/commandexecutor.h
@@ -27,7 +27,7 @@
 #define COMMANDEXECUTOR_H
 
 #include "makefile.h"
-#include "process.h"
+#include "jomprocess.h"
 #include <QFile>
 #include <QString>
 
diff --git a/src/jomlib/jobserver.cpp b/src/jomlib/jobserver.cpp
index 7d9c0e6..8667eff 100644
--- a/src/jomlib/jobserver.cpp
+++ b/src/jomlib/jobserver.cpp
@@ -47,8 +47,8 @@ bool JobServer::start(int maxNumberOfJobs)
 {
     Q_ASSERT(m_environment);
 
-    const uint randomId = (FileTime::currentTime().internalRepresentation() % UINT_MAX)
-        ^ reinterpret_cast<uint>(&maxNumberOfJobs);
+    const quint64 randomId = (FileTime::currentTime().internalRepresentation() % UINT_MAX)
+        ^ reinterpret_cast<quint64>(&maxNumberOfJobs);
     const QString semaphoreKey = QLatin1String("jomsrv-")
             + QString::number(QCoreApplication::applicationPid()) + QLatin1Char('-')
             + QString::number(randomId);
diff --git a/src/jomlib/jomlib.pro b/src/jomlib/jomlib.pro
index f1b6f1d..c178c30 100644
--- a/src/jomlib/jomlib.pro
+++ b/src/jomlib/jomlib.pro
@@ -53,12 +53,12 @@ win32-* {
     HEADERS +=  \
         iocompletionport.h
     SOURCES += \
-        process.cpp \
+        jomprocess.cpp \
         iocompletionport.cpp
 } else {
     DEFINES += USE_QPROCESS
     SOURCES += \
-        process_qt.cpp
+        jomprocess_qt.cpp
 }
 
 HEADERS +=  \
@@ -78,9 +78,8 @@ HEADERS +=  \
     ppexprparser.h \
     targetexecutor.h \
     commandexecutor.h \
-    process.h \
+    jomprocess.h \
     processenvironment.h \
-    iocompletionport.h \
     jobclient.h \
     jobclientacquirehelper.h
 
diff --git a/src/jomlib/process.cpp b/src/jomlib/jomprocess.cpp
index cf63f8d..6b6e97d 100644
--- a/src/jomlib/process.cpp
+++ b/src/jomlib/jomprocess.cpp
@@ -26,7 +26,7 @@
 #define _CRT_RAND_S
 #include <cstdlib>
 
-#include "process.h"
+#include "jomprocess.h"
 #include "helperfunctions.h"
 #include "iocompletionport.h"
 
diff --git a/src/jomlib/process.h b/src/jomlib/jomprocess.h
index 1dac079..1dac079 100644
--- a/src/jomlib/process.h
+++ b/src/jomlib/jomprocess.h
diff --git a/src/jomlib/process_qt.cpp b/src/jomlib/jomprocess_qt.cpp
index 6fef553..cae9df6 100644
--- a/src/jomlib/process_qt.cpp
+++ b/src/jomlib/jomprocess_qt.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "process.h"
+#include "jomprocess.h"
 #include <cstdio>
 
 namespace NMakeFile {
diff --git a/src/jomlib/use_jomlib.pri b/src/jomlib/use_jomlib.pri
index 3d1d9bf..33adf77 100644
--- a/src/jomlib/use_jomlib.pri
+++ b/src/jomlib/use_jomlib.pri
@@ -1,11 +1,20 @@
 isEmpty(PROJECT_BUILD_ROOT):error(PROJECT_BUILD_ROOT must be set)
 
+win32-g++ {
+    JOMLIB_PREFIX = lib
+    JOMLIB_SUFFIX = a
+} else {
+    JOMLIB_PREFIX =
+    JOMLIB_SUFFIX = lib
+}
+
 build_pass:CONFIG(debug, debug|release) {
-    JOMLIB = $$PROJECT_BUILD_ROOT/lib/jomlibd.lib
+    JOMLIB = $$PROJECT_BUILD_ROOT/lib/$${JOMLIB_PREFIX}jomlibd.$$JOMLIB_SUFFIX
 }
 build_pass:CONFIG(release, debug|release) {
-    JOMLIB = $$PROJECT_BUILD_ROOT/lib/jomlib.lib
+    JOMLIB = $$PROJECT_BUILD_ROOT/lib/$${JOMLIB_PREFIX}jomlib.$$JOMLIB_SUFFIX
 }
+
 LIBS += $$JOMLIB
 POST_TARGETDEPS += $$JOMLIB
 unset(JOMLIB)