diff --git a/.github/workflows/build-process.yml b/.github/workflows/build-process.yml index a7cefcc39..638f180a9 100644 --- a/.github/workflows/build-process.yml +++ b/.github/workflows/build-process.yml @@ -46,7 +46,7 @@ jobs: - name: Install dependencies if: ${{ matrix.prefix == 'lnx' }} - run: sudo apt update && sudo apt install build-essential x11-utils mesa-common-dev libglu1-mesa-dev libasound2-dev zlib1g-dev pulseaudio dbus-x11 libportaudio2 libcurl4-openssl-dev + run: sudo apt update && sudo apt install build-essential x11-utils mesa-common-dev libglu1-mesa-dev libasound2-dev libpng-dev pulseaudio dbus-x11 libportaudio2 libcurl4-openssl-dev # Pulseaudio puts a dummy ALSA device in place, which allows us to do # audio testing on Linux diff --git a/internal/c/parts/os/clipboard/build.mk b/internal/c/parts/os/clipboard/build.mk index 2fbdea3d5..f65d6eaec 100644 --- a/internal/c/parts/os/clipboard/build.mk +++ b/internal/c/parts/os/clipboard/build.mk @@ -2,7 +2,7 @@ # clip Setup: # Download the latest release from https://github.com/dacap/clip # Copy all source files except clip_none.cpp to internal/c/parts/os/clipboard/clip -# Compile the source using -DCLIP_ENABLE_IMAGE=1 and -DHAVE_XCB_XLIB_H (Linux only) +# Compile the source using -DCLIP_ENABLE_IMAGE=1, -DHAVE_XCB_XLIB_H (Linux) and DHAVE_PNG_H (Linux) CLIP_DEFS := -DCLIP_ENABLE_IMAGE=1 @@ -12,7 +12,8 @@ CLIP_SRCS := \ ifeq ($(OS),lnx) CLIP_SRCS += clip_x11.cpp - CLIP_DEFS += -DHAVE_XCB_XLIB_H + CLIP_DEFS += -DHAVE_XCB_XLIB_H -DHAVE_PNG_H + CXXLIBS += -lpng endif ifeq ($(OS),win) @@ -52,3 +53,4 @@ $(CLIPBOARD_LIB): $(CLIP_OBJS) $(CLIPBOARD_OBJS) EXE_LIBS += $(CLIPBOARD_LIB) CLEAN_LIST += $(CLIPBOARD_LIB) $(CLIP_OBJS) $(CLIPBOARD_OBJS) + diff --git a/setup_lnx.sh b/setup_lnx.sh index 0c3bec7ae..933c37f13 100755 --- a/setup_lnx.sh +++ b/setup_lnx.sh @@ -81,19 +81,19 @@ if [ "$DISTRO" == "arch" ]; then pkg_install elif [ "$DISTRO" == "linuxmint" ] || [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "zorin" ]; then echo "Debian based distro detected." - pkg_list="build-essential x11-utils mesa-common-dev libglu1-mesa-dev libasound2-dev zlib1g-dev libcurl4-openssl-dev $GET_WGET" + pkg_list="build-essential x11-utils mesa-common-dev libglu1-mesa-dev libasound2-dev libpng-dev libcurl4-openssl-dev $GET_WGET" installed_packages=`dpkg -l` installer_command="sudo apt-get -y install " pkg_install elif [ "$DISTRO" == "fedora" ] || [ "$DISTRO" == "redhat" ] || [ "$DISTRO" == "centos" ]; then echo "Fedora/Redhat based distro detected." - pkg_list="gcc-c++ make mesa-libGLU-devel alsa-lib-devel zlib-devel libcurl-devel $GET_WGET" + pkg_list="gcc-c++ make mesa-libGLU-devel alsa-lib-devel libpng-devel libcurl-devel $GET_WGET" installed_packages=`yum list installed` installer_command="sudo yum install " pkg_install elif [ "$DISTRO" == "voidlinux" ]; then echo "VoidLinux detected." - pkg_list="gcc make glu-devel zlib-devel alsa-lib-devel libcurl-devel $GET_WGET" + pkg_list="gcc make glu-devel libpng-devel alsa-lib-devel libcurl-devel $GET_WGET" installed_packages=`xbps-query -l |grep -v libgcc` installer_command="sudo xbps-install -Sy " pkg_install @@ -104,7 +104,7 @@ elif [ -z "$DISTRO" ]; then echo " OpenGL development libraries" echo " ALSA development libraries" echo " GNU C++ Compiler (g++)" - echo " zlib" + echo " libpng" fi echo "Compiling and installing QB64-PE..."