Skip to content

Commit 5cc89f1

Browse files
author
WiSo
committed
[WIN32] changed mingw: use NUMBER_OF_PROCESSORS jobs for compiling (-jNUMBER_OF_PROCESSORS)
1 parent e2f0af2 commit 5cc89f1

File tree

5 files changed

+35
-8
lines changed

5 files changed

+35
-8
lines changed

lib/asap/win32/build_xbmc_win32.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
#!/bin/bash
22

3+
MAKEFLAGS=""
4+
35
if [ "$1" == "clean" ]
46
then
57
make clean
68
fi
9+
if [ $NUMBER_OF_PROCESSORS > 1 ]; then
10+
MAKEFLAGS=-j$NUMBER_OF_PROCESSORS
11+
fi
712

8-
make xbmc
13+
make $MAKEFLAGS xbmc
914

1015
cp xbmc_asap.dll /xbmc/system/players/paplayer/

lib/ffmpeg/build_xbmc_win32.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
MAKEFLAGS=""
4+
35
if [ "$1" == "clean" ]
46
then
57
if [ -d .libs ]
@@ -9,6 +11,10 @@ then
911
make distclean
1012
fi
1113

14+
if [ $NUMBER_OF_PROCESSORS > 1 ]; then
15+
MAKEFLAGS=-j$NUMBER_OF_PROCESSORS
16+
fi
17+
1218
if [ ! -d .libs ]; then
1319
mkdir .libs
1420
fi
@@ -41,7 +47,7 @@ OPTIONS="
4147

4248
./configure --extra-cflags="-fno-common -Iinclude-xbmc-win32/dxva2" --extra-ldflags="-L/xbmc/system/players/dvdplayer" ${OPTIONS} &&
4349

44-
make &&
50+
make $MAKEFLAGS &&
4551
cp lib*/*.dll .libs/ &&
4652
cp .libs/avcodec-52.dll /xbmc/system/players/dvdplayer/ &&
4753
cp .libs/avcore-0.dll /xbmc/system/players/dvdplayer/ &&

lib/libdvd/build-xbmc-win32.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
#!/bin/sh
22

33
MAKECLEAN=0
4+
MAKEFLAGS=""
45

56
if [ "$1" == "clean" ]
67
then
78
MAKECLEAN=1
89
fi
910

11+
if [ $NUMBER_OF_PROCESSORS > 1 ]; then
12+
MAKEFLAGS=-j$NUMBER_OF_PROCESSORS
13+
fi
14+
1015
#libdvdcss
1116
cd libdvdcss
1217
echo "***** Cleaning libdvdcss *****"
@@ -21,7 +26,7 @@ sh bootstrap
2126
--disable-doc \
2227
--enable-static \
2328
--with-pic
24-
make
29+
make $MAKEFLAGS
2530
strip -S src/.libs/libdvdcss-2.dll
2631
cd ..
2732
mkdir -p includes/dvdcss
@@ -43,7 +48,7 @@ echo "***** Building libdvdread *****"
4348
--disable-debug
4449
mkdir -p ../includes/dvdread
4550
cp ../libdvdread/src/*.h ../includes/dvdread
46-
make
51+
make $MAKEFLAGS
4752
cd ..
4853

4954
#libdvdnav
@@ -60,7 +65,7 @@ echo "***** Building libdvdnav *****"
6065
--extra-cflags="-D_XBMC -DNDEBUG -I`pwd`/../includes" \
6166
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
6267
--disable-debug
63-
make
68+
make $MAKEFLAGS
6469
gcc \
6570
-shared \
6671
-o obj/libdvdnav.dll \

lib/libmpeg2/make-xbmc-lib-win32.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash
1+
#!/bin/bash
2+
3+
MAKEFLAGS=""
24

35
if [ "$1" == "clean" ]
46
then
@@ -9,6 +11,10 @@ then
911
make distclean
1012
fi
1113

14+
if [ $NUMBER_OF_PROCESSORS > 1 ]; then
15+
MAKEFLAGS=-j$NUMBER_OF_PROCESSORS
16+
fi
17+
1218
./configure \
1319
--with-pic \
1420
--disable-static \
@@ -17,7 +23,7 @@ fi
1723
--disable-sdl \
1824
--without-x &&
1925

20-
make &&
26+
make $MAKEFLAGS &&
2127

2228
strip libmpeg2/.libs/*.dll &&
2329
cp libmpeg2/.libs/*.dll /xbmc/system/players/dvdplayer/

project/Win32BuildSetup/buildmingwlibs.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ TOUCH=/bin/touch
66
RM=/bin/rm
77
NOPROMPT=0
88
MAKECLEAN=""
9+
MAKEFLAGS=""
910

1011
function throwerror ()
1112
{
@@ -48,6 +49,10 @@ if [ -f $MAKECLEANFILE ]; then
4849
MAKECLEAN="clean"
4950
fi
5051

52+
if [ $NUMBER_OF_PROCESSORS > 1 ]; then
53+
MAKEFLAGS=-j$NUMBER_OF_PROCESSORS
54+
fi
55+
5156
# compile our mingw dlls
5257
echo "################################"
5358
echo "## compiling mingw libs"
@@ -81,7 +86,7 @@ cd /xbmc/lib/timidity/
8186
if [ "$MAKECLEAN" == "clean" ]; then
8287
make -f Makefile.win32 clean
8388
fi
84-
make -f Makefile.win32
89+
make -f Makefile.win32 $MAKEFLAGS
8590
setfilepath /xbmc/system/players/paplayer
8691
checkfiles timidity.dll
8792
echo "##### building of timidity dlls done #####"

0 commit comments

Comments
 (0)