From c198aed46abfac140514b0d081c79b33b7b7c410 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Thu, 9 Oct 2014 13:55:51 +0200
Subject: update jom to v1.0.14

---
 win32/bin/changelog.jom.txt |  12 +++++++++++-
 win32/bin/ibjom.cmd         |   2 +-
 win32/bin/jom.exe           | Bin 1627648 -> 1685504 bytes
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'win32/bin')

diff --git a/win32/bin/changelog.jom.txt b/win32/bin/changelog.jom.txt
index 3126036..47e597a 100644
--- a/win32/bin/changelog.jom.txt
+++ b/win32/bin/changelog.jom.txt
@@ -1,4 +1,14 @@
-This is the changelog for jom 1.0.13, the parallel make tool.
+This is the changelog for jom 1.0.14, the parallel make tool.
+
+Changes since jom 1.0.13
+- Fix exit code forwarding. (QTCREATORBUG-11556)
+- Fix file name macro modifers for $** and $?. (QTCREATORBUG-6932)
+- Fix equal signs in semicolon command syntax. (QTCREATORBUG-7942)
+- Fix error line numbers for inline files. (QTCREATORBUG-8451)
+- Ignore macro assignments in inline files. (QTCREATORBUG-8452)
+- Yield error on unexpected !ENDIF directive.
+- Support wildcards in dependency lines. (QTCREATORBUG-10439)
+- Use IcrediBuild's BuildConsole instead of the XGE interface in ibjom.
 
 Changes since jom 1.0.12
 - Fix spurious "Can't start command" error.
diff --git a/win32/bin/ibjom.cmd b/win32/bin/ibjom.cmd
index 358fbe5..d5e4448 100644
--- a/win32/bin/ibjom.cmd
+++ b/win32/bin/ibjom.cmd
@@ -1,3 +1,3 @@
 @echo off
 if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=20
-xgConsole /profile="%~dp0\profile.xml" /command="jom -j%IBJOM_NUMBEROFJOBS% %*"
+BuildConsole /command="jom -j%IBJOM_NUMBEROFJOBS% %*"
diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe
index 300574c..2506b4e 100644
Binary files a/win32/bin/jom.exe and b/win32/bin/jom.exe differ
-- 
cgit v1.2.3