More CI stuff; use pkg-config --static

Signed-off-by: falkTX <falktx@falktx.com>

.travis.yml

@@ -2,10 +2,11 @@ language: cpp
 
 os: linux
 
-dist: trusty
+dist: bionic
 
 cache:
   directories:
+  - ${HOME}/PawPawBuilds/debs
   - ${HOME}/PawPawBuilds/downloads
 
 jobs:

.travis/before_install.sh

@@ -2,7 +2,6 @@
 
 set -e
 
-sudo add-apt-repository -y ppa:kxstudio-debian/mingw
 sudo add-apt-repository -y ppa:kxstudio-debian/kxstudio
 sudo add-apt-repository -y ppa:kxstudio-debian/toolchain
 

.travis/install.sh

@@ -3,16 +3,26 @@
 set -e
 
 # common
-sudo apt-get install -y build-essential coreutils curl cmake jq
+sudo apt-get install -y build-essential curl cmake jq
 
 # for cross-compilation
 if [ "${TARGET}" = "macos-old" ]; then
-    sudo apt-get install -y apple-x86-gcc apple-uni-sdk-10.5
+    mkdir -p ${HOME}/PawPawBuilds/debs
+    pushd ${HOME}/PawPawBuilds/debs
+    if [ ! -f 'apple-uni-sdk-10.5_20110407-0.flosoft1_amd64.deb' ]; then
+        wget -c 'https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/apple-uni-sdk-10.5_20110407-0.flosoft1_amd64.deb'
+    fi
+    if [ ! -f 'apple-x86-gcc_4.2.1~5646-1kxstudio2_amd64.deb' ]; then
+        wget -c 'https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/apple-x86-gcc_4.2.1~5646-1kxstudio2_amd64.deb'
+    fi
+    sudo dpkg -i 'apple-uni-sdk-10.5_20110407-0.flosoft1_amd64.deb'
+    sudo dpkg -i 'apple-x86-gcc_4.2.1~5646-1kxstudio2_amd64.deb'
+    popd
 
 elif [ "${TARGET}" = "win32" ]; then
-    sudo apt-get install -y mingw32-x-gcc
+    sudo apt-get install -y mingw-w64 binutils-mingw-w64-i686 g++-mingw-w64-i686
 
 elif [ "${TARGET}" = "win64" ]; then
-    sudo apt-get install -y mingw64-x-gcc
+    sudo apt-get install -y mingw-w64 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
 
 fi

setup/env.sh

@@ -104,6 +104,7 @@ TARGET_CXX="${TOOLCHAIN_PREFIX_}g++"
 TARGET_LD="${TOOLCHAIN_PREFIX_}ld"
 TARGET_STRIP="${TOOLCHAIN_PREFIX_}strip"
 TARGET_PATH="${PAWPAW_PREFIX}/bin:/usr/${TOOLCHAIN_PREFIX}/bin:${PATH}"
+TARGET_PKG_CONFIG="${PAWPAW_PREFIX}/bin/pkg-config --static"
 TARGET_PKG_CONFIG_PATH="${PAWPAW_PREFIX}/lib/pkgconfig"
 
 # ---------------------------------------------------------------------------------------------------------------------

setup/functions.sh

@@ -74,6 +74,7 @@ function _prebuild() {
     export CFLAGS="${TARGET_CFLAGS}"
     export CXXFLAGS="${TARGET_CXXFLAGS}"
     export LDFLAGS="${TARGET_LDFLAGS}"
+    export PKG_CONFIG="${TARGET_PKG_CONFIG}"
     export PKG_CONFIG_PATH="${TARGET_PKG_CONFIG_PATH}"
 
     unset CPPFLAGS
@@ -100,6 +101,7 @@ function _postbuild() {
     unset CPPFLAGS
     unset CXXFLAGS
     unset LDFLAGS
+    unset PKG_CONFIG
     unset PKG_CONFIG_PATH
 
     export PATH="${OLD_PATH}"