From f7d1d3dadb4088b67ba31353ae22f2cb9f335c37 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Tue, 22 Oct 2019 18:48:11 +0100
Subject: [PATCH] Compile fixes.

---
 CHANGELOG      | 16 ++++++++++------
 makefile.win32 |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index af6fa9b..c4382c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 Changelog
 
+1.5.1
+	* Updated Catalan translation (thanks, oriolhub)
+	* Misc bug and compile fixes.
+
 1.5
 
 	* Game now renders at chosen resolution instead of scaling up from 1280 x 720
@@ -37,7 +41,7 @@ Changelog
 	* Epic missions now have limited "lives". A player can only be killed a certain number of times before they automatically fail the mission. This is to discourage reckless play.
 
 1.01
-	
+
 	* Corrected "Nation of Tzac" to "Kingdom of Tzac" in a few cases
 	* Fixed broken REVISION makefile macro when git is not available
 
@@ -69,7 +73,7 @@ Changelog
 	* Campaign tweaks and bugs fixes
 
 0.95
-	
+
 	* AI fixes
 	* Campaign tweaks and bugs fixes
 	* Reset entity owner when detaching tow rope
@@ -87,11 +91,11 @@ Changelog
 	* Lowered difficulty of some missions
 
 0.92
-	
+
 	* Campaign tweaks and bug fixes
 
 0.91
-	
+
 	* New music track by Vehicle
 	* Added effects when bullets hit targets
 	* Updated Mantis sprite
@@ -101,7 +105,7 @@ Changelog
 	* Misc. tweaks and fixes
 
 0.9
-	
+
 	* Added final campaign missions
 	* Added final challenges
 	* Enabled all trophies
@@ -151,7 +155,7 @@ Changelog
 	* Misc. AI, mission, and bug fixes
 
 0.4
-	
+
 	* Added mouse + keyboard controls (replaces keyboard-only method)
 	* Added new craft: Kingfisher, Mantis, Rook, Hammerhead, Khepri, Scarab, Thunderhead.
 	* Added laser cannon - highly effective against shields
diff --git a/makefile.win32 b/makefile.win32
index 5e56803..df0740a 100644
--- a/makefile.win32
+++ b/makefile.win32
@@ -7,8 +7,12 @@ LOCALE_DIR = locale
 SEARCHPATH += src/plat/win32
 _OBJS += win32Init.o
 
+NPROCS = $(shell grep -c 'processor' /proc/cpuinfo)
+MAKEFLAGS += -j$(NPROCS)
+
 CXXFLAGS += `$(SDLC) --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\"
 CXXFLAGS += -ansi
+CXXFLAGS += -m32
 
 LDFLAGS += `$(SDLC) --libs` -lm -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lSDL2main