From 9c62fff6e7637aa9b6d17fb2fba92e1ad7bd3f34 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 24 Mar 2024 01:51:16 +0500 Subject: [PATCH 1/3] Build guide: Add vulkan-headers for MSYS2 --- dev/buildguide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/buildguide.rst b/dev/buildguide.rst index 65918ae..7ba3caf 100644 --- a/dev/buildguide.rst +++ b/dev/buildguide.rst @@ -116,7 +116,7 @@ MSYS2 .. code-block:: bash - $ pacman -Syu $MINGW_PACKAGE_PREFIX-ninja $MINGW_PACKAGE_PREFIX-cmake $MINGW_PACKAGE_PREFIX-gcc $MINGW_PACKAGE_PREFIX-pkgconf $MINGW_PACKAGE_PREFIX-openal $MINGW_PACKAGE_PREFIX-freetype $MINGW_PACKAGE_PREFIX-SDL2 $MINGW_PACKAGE_PREFIX-zlib $MINGW_PACKAGE_PREFIX-libpng $MINGW_PACKAGE_PREFIX-rtmidi $MINGW_PACKAGE_PREFIX-fluidsynth $MINGW_PACKAGE_PREFIX-libslirp $MINGW_PACKAGE_PREFIX-qt5-static $MINGW_PACKAGE_PREFIX-qt5-translations + $ pacman -Syu $MINGW_PACKAGE_PREFIX-ninja $MINGW_PACKAGE_PREFIX-cmake $MINGW_PACKAGE_PREFIX-gcc $MINGW_PACKAGE_PREFIX-pkgconf $MINGW_PACKAGE_PREFIX-openal $MINGW_PACKAGE_PREFIX-freetype $MINGW_PACKAGE_PREFIX-SDL2 $MINGW_PACKAGE_PREFIX-zlib $MINGW_PACKAGE_PREFIX-libpng $MINGW_PACKAGE_PREFIX-rtmidi $MINGW_PACKAGE_PREFIX-fluidsynth $MINGW_PACKAGE_PREFIX-libslirp $MINGW_PACKAGE_PREFIX-qt5-static $MINGW_PACKAGE_PREFIX-qt5-translations $MINGW_PACKAGE_PREFIX-vulkan-headers .. note:: The command installs the packages only for the currently used MinGW environment, therefore you will need to repeat the procedure for every target you plan to build for. From a098b8d0941ca86b68f3307ef416fc2ff0630a3e Mon Sep 17 00:00:00 2001 From: Robert <17701098+rderooy@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:14:29 +0200 Subject: [PATCH 2/3] prevent build error about missing libz.a (#36) Without this, the build fails with: ``` Make Error at /usr/lib64/cmake/ZLIB/ZLIB.cmake:81 (message): The imported target "ZLIB::zlibstatic" references the file "/usr/lib64/libz.a" but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. * The installation package was faulty and contained "/usr/lib64/cmake/ZLIB/ZLIB.cmake" but not all the files it references. Call Stack (most recent call first): /usr/lib64/cmake/ZLIB/zlib-config.cmake:44 (include) /usr/share/cmake/Modules/FindPNG.cmake:65 (find_package) src/CMakeLists.txt:136 (find_package) ``` --- dev/buildguide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/buildguide.rst b/dev/buildguide.rst index 7ba3caf..a3b6c32 100644 --- a/dev/buildguide.rst +++ b/dev/buildguide.rst @@ -142,7 +142,7 @@ Fedora .. code-block:: bash $ sudo dnf groupinstall "C Development Tools and Libraries" - $ sudo dnf install cmake extra-cmake-modules pkg-config ninja-build freetype-devel SDL2-devel libatomic libpng-devel libslirp-devel libXi-devel openal-soft-devel rtmidi-devel fluidsynth-devel qt5-linguist qt5-qtconfiguration-devel qt5-qtbase-private-devel qt5-qtbase-static wayland-devel libevdev-devel libxkbcommon-x11-devel + $ sudo dnf install cmake extra-cmake-modules pkg-config ninja-build freetype-devel SDL2-devel libatomic libpng-devel libslirp-devel libXi-devel openal-soft-devel rtmidi-devel fluidsynth-devel qt5-linguist qt5-qtconfiguration-devel qt5-qtbase-private-devel qt5-qtbase-static wayland-devel libevdev-devel libxkbcommon-x11-devel zlib-ng-compat-static macOS (Homebrew) From 167abf0da169ef30fa4929f1f022351f93543d1f Mon Sep 17 00:00:00 2001 From: rilysh Date: Fri, 26 Jul 2024 20:44:51 +0530 Subject: [PATCH 3/3] buildguide: add a note describing the possible error with libevdev on FreeBSD (#34) There seem to be a "port" of GNU/Linux's libevdev on FreeBSD. However, it's not exactly a port, and it includes linux/input.h file which on FreeBSD doesn't exist. The equivalent file for linux/input.h is dev/evdev/input.h. Unless the upstream maintainer of libevdev adds this (may not), we should add a note here, describing the possible error on compilation of 86Box on FreeBSD. --- dev/buildguide.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/buildguide.rst b/dev/buildguide.rst index a3b6c32..2aff06a 100644 --- a/dev/buildguide.rst +++ b/dev/buildguide.rst @@ -160,6 +160,8 @@ FreeBSD $ pkg install pkgconf freetype-gl sdl2 libspng openal-soft rtmidi qt5 libslirp fluidsynth +.. note:: On FreeBSD, you might need to edit the ``libevdev.h`` file, resides in ``/usr/local/include/libevdev/`` and replace the following ``linux/input.h`` file with ``dev/evdev/input.h``. After that run the ``make`` command once again. + Building --------