allow 3rdparty to build with make -j3

This commit is contained in:
Thomas Bernard 2018-12-02 18:03:22 +01:00
parent e1153b9bb5
commit 513817c439
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
3 changed files with 20 additions and 6 deletions

View File

@ -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"

View File

@ -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'

View File

@ -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 \