From 513817c43919cb6a878427b2aa04415ce36a6419 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Sun, 2 Dec 2018 18:03:22 +0100
Subject: [PATCH] allow 3rdparty to build with make -j3

---
 .gitlab-ci.yml            |  2 +-
 .travis.yml               |  2 +-
 3rdparty/SDL-1.2.15.patch | 22 ++++++++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8273991..b3690bf5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ job_win32:
         - apt-get update -qq && apt-get install -y -qq zip dos2unix
         - apt-get install -y -qq gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-tools nsis
     script:
-        - "WIN32CROSS=1 make 3rdparty"
+        - "WIN32CROSS=1 make 3rdparty -j3"
         - "WIN32CROSS=1 make -j3"
         - "WIN32CROSS=1 make ziprelease"
         - "WIN32CROSS=1 make win32installer"
diff --git a/.travis.yml b/.travis.yml
index bce1ccd3..88134001 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ install:
 
 script:
   - 'cd $TRAVIS_BUILD_DIR'
-  - 'if [ "$WIN32CROSS" = "1" ] ; then make 3rdparty ; fi'
+  - 'if [ "$WIN32CROSS" = "1" ] ; then make 3rdparty -j3 ; fi'
   - 'make -j3'
   - 'make ziprelease'
   - 'if [ "$WIN32CROSS" = "1" ] ; then make win32installer ; fi'
diff --git a/3rdparty/SDL-1.2.15.patch b/3rdparty/SDL-1.2.15.patch
index 48c16ab9..652b3677 100644
--- a/3rdparty/SDL-1.2.15.patch
+++ b/3rdparty/SDL-1.2.15.patch
@@ -1,6 +1,6 @@
---- SDL-1.2.15.orig/Makefile	2018-02-18 22:58:20.779552000 +0100
-+++ SDL-1.2.15/Makefile	2018-02-18 22:58:27.229780000 +0100
-@@ -1,7 +1,7 @@
+--- SDL-1.2.15.orig/Makefile	2012-01-05 05:43:30.000000000 +0100
++++ SDL-1.2.15/Makefile	2018-12-02 11:43:34.939956000 +0100
+@@ -1,17 +1,17 @@
  #
  # Makefile for installing the Mingw32 version of the SDL library
  
@@ -8,4 +8,18 @@
 +CROSS_PATH ?= /usr/local/cross-tools/i686-w64-mingw32
  
  all:
- 	@echo "Type \"make native\" to install to /usr"
+-	@echo "Type \"make native\" to install to /usr"
+-	@echo "Type \"make cross\" to install to $(CROSS_PATH)"
++	@echo "Type \"$(MAKE) native\" to install to /usr"
++	@echo "Type \"$(MAKE) cross\" to install to $(CROSS_PATH)"
+ 
+ native:
+-	make install-sdl prefix=/usr
++	$(MAKE) install-sdl prefix=/usr
+ 
+ cross:
+-	make install-sdl prefix=$(CROSS_PATH)
++	$(MAKE) install-sdl prefix=$(CROSS_PATH)
+ 
+ install-sdl:
+ 	if test -d $(prefix); then \