Merge branch 'bones_was_here/Makefile' into 'master'

[xonotic/xonotic.git] / misc / buildsrc / dlls.sh

diff --git a/misc/buildsrc/dlls.sh b/misc/buildsrc/dlls.sh
index 98b27cd7858f79aab72797b57a462a86588adf51..c5c8ff7285529a8f04c23aafdb0518d914dd4930 100755 (executable)
--- a/misc/buildsrc/dlls.sh
+++ b/misc/buildsrc/dlls.sh
@@ -4,8 +4,6 @@
 # by z411
 
 d0=$(pwd)
-cjobs=$(($(nproc) + 1))
-echo "Working directory is $d0"
 
 require () {
        if ! dpkg -s "$1" >/dev/null 2>&1 ; then
@@ -101,7 +99,7 @@ build_zlib () {
              -DBUILD_SHARED_LIBS=ON \
              -DCMAKE_INSTALL_PREFIX="$pkg_dir" \
              -G"Unix Makefiles" "$this_src"
-       make -j${cjobs}
+       make
        make install
 }      
 
@@ -115,7 +113,7 @@ build_gmp () {
                              --enable-fat \
                              --disable-static \
                              --enable-shared
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -136,7 +134,7 @@ build_libd0 () {
        "$src_dir/d0_blind_id/configure" --with-pic \
                                         --prefix="$pkg_dir" \
                                         --host="$CHOST"
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -151,7 +149,7 @@ build_libogg() {
              -DBUILD_SHARED_LIBS=ON \
              -DCMAKE_INSTALL_PREFIX="$pkg_dir" \
              -G"Unix Makefiles" "$this_src"
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -170,7 +168,7 @@ build_libvorbis () {
              -DOGG_LIBRARY="$pkg_dir/lib/libogg.dll.a" \
              -DCMAKE_INSTALL_PREFIX="$pkg_dir" \
              -G"Unix Makefiles" "$this_src"
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -194,7 +192,7 @@ build_libtheora () {
                              --disable-sdltest \
                              --disable-vorbistest \
                              --disable-oggtest
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -207,7 +205,7 @@ build_freetype () {
              -DCMAKE_BUILD_TYPE=Release \
              -DCMAKE_INSTALL_PREFIX="$pkg_dir" \
              -G"Unix Makefiles" "$this_src"
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -222,7 +220,7 @@ build_libpng16 () {
              -DZLIB_LIBRARY="$pkg_dir/lib/libzlib.dll.a" \
              -DCMAKE_INSTALL_PREFIX="$pkg_dir" \
              -G"Unix Makefiles" "$this_src"
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -237,7 +235,7 @@ build_libjpeg () {
              -DENABLE_STATIC=OFF \
              -DWITH_TURBOJPEG=OFF \
              -G"Unix Makefiles" "$this_src"
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -258,7 +256,7 @@ build_curl () {
              -DBUILD_CURL_EXE=OFF \
              -DHTTP_ONLY=ON \
              -G"Unix Makefiles" "$this_src"
-       make -j${cjobs}
+       make
        make install
 }
 
@@ -292,6 +290,11 @@ install () {
        cp -v "$pkg_dir/bin/libjpeg-62.dll" "$out_dir/libjpeg.dll"
        cp -v "$pkg_dir/bin/libcurl.dll" "$out_dir/libcurl-4.dll"
 
+       # Required for win32 builds
+       if [ "$ARCH" = "i686" ]; then
+               cp -v "/usr/lib/gcc/i686-w64-mingw32/10-win32/libgcc_s_dw2-1.dll" "$out_dir"
+       fi
+
        cd "$out_dir"
        ${CHOST}-strip -s *.dll
 }