@@ -64,6 +64,10 @@ jobs: | |||||
run: | | run: | | ||||
sudo apt-get update -qq | sudo apt-get update -qq | ||||
sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libqt4-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev | sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libqt4-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev | ||||
# Fix 32bit bridge build | |||||
sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so | |||||
sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so | |||||
sudo ln -s /usr/lib/i386-linux-gnu/libfreetype.so.6 /usr/lib/i386-linux-gnu/libfreetype.so | |||||
- name: make features | - name: make features | ||||
run: make features | run: make features | ||||
- name: make | - name: make | ||||
@@ -79,6 +83,10 @@ jobs: | |||||
run: | | run: | | ||||
sudo apt-get update -qq | sudo apt-get update -qq | ||||
sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev | sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev | ||||
# Fix 32bit bridge build | |||||
sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so | |||||
sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so | |||||
sudo ln -s /usr/lib/i386-linux-gnu/libfreetype.so.6 /usr/lib/i386-linux-gnu/libfreetype.so | |||||
- name: make features | - name: make features | ||||
run: make features | run: make features | ||||
- name: make | - name: make | ||||
@@ -22,7 +22,7 @@ jobs: | |||||
run: | | run: | | ||||
sudo dpkg --add-architecture i386 | sudo dpkg --add-architecture i386 | ||||
sudo apt-get update -qq | sudo apt-get update -qq | ||||
sudo apt-get install -yq g++-multilib pkg-config wine-stable | |||||
sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-development-tools | |||||
sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 | sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 | ||||
- name: make wine32 | - name: make wine32 | ||||
run: make wine32 -j $(nproc) | run: make wine32 -j $(nproc) | ||||
@@ -47,7 +47,7 @@ jobs: | |||||
run: | | run: | | ||||
sudo dpkg --add-architecture i386 | sudo dpkg --add-architecture i386 | ||||
sudo apt-get update -qq | sudo apt-get update -qq | ||||
sudo apt-get install -yq g++-multilib pkg-config wine-stable | |||||
sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-development-tools | |||||
sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 | sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64 | ||||
- name: make wine32 | - name: make wine32 | ||||
run: make wine32 -j $(nproc) | run: make wine32 -j $(nproc) | ||||
@@ -229,9 +229,9 @@ struct GtkLoader { | |||||
break; | break; | ||||
} | } | ||||
if (glib == nullptr) | |||||
if (golib == nullptr) | |||||
{ | { | ||||
fprintf(stderr, "Failed to load glib, reason:\n%s\n", lib_error(gofilename)); | |||||
fprintf(stderr, "Failed to load gobject, reason:\n%s\n", lib_error(gofilename)); | |||||
return; | return; | ||||
} | } | ||||
else | else | ||||