diff options
Diffstat (limited to 'emulators/86Box/files')
7 files changed, 1 insertions, 64 deletions
diff --git a/emulators/86Box/files/86Box-install-roms.sh.in b/emulators/86Box/files/86Box-install-roms.sh.in index 0c0cf18f342b..6b899380545a 100644 --- a/emulators/86Box/files/86Box-install-roms.sh.in +++ b/emulators/86Box/files/86Box-install-roms.sh.in @@ -5,7 +5,7 @@ DEFAULT_TARGET_DIR="$HOME/.local/share/86Box/" TARGET_DIR=${TARGET_DIR:-$DEFAULT_TARGET_DIR} install_roms() { - if [ -d "$TARGET_DIR" ] && [ "$(ls -A $TARGET_DIR)" ]; then + if [ -d "$TARGET_DIR/roms" ] && [ "$(ls -A $TARGET_DIR/roms)" ]; then echo "ROMs already installed in $TARGET_DIR" echo "To (re)install, please first remove ROMs with -r parameter" exit 1 diff --git a/emulators/86Box/files/patch-cmake_flags-gcc-aarch64.cmake b/emulators/86Box/files/patch-cmake_flags-gcc-aarch64.cmake deleted file mode 100644 index 3a58a593294f..000000000000 --- a/emulators/86Box/files/patch-cmake_flags-gcc-aarch64.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/flags-gcc-aarch64.cmake.orig 2024-07-26 18:14:45 UTC -+++ cmake/flags-gcc-aarch64.cmake -@@ -14,7 +14,4 @@ - # Copyright 2021 David Hrdlička. - # - --string(APPEND CMAKE_C_FLAGS_INIT " -march=armv8-a") --string(APPEND CMAKE_CXX_FLAGS_INIT " -march=armv8-a") -- - include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake) diff --git a/emulators/86Box/files/patch-cmake_flags-gcc-armv7.cmake b/emulators/86Box/files/patch-cmake_flags-gcc-armv7.cmake deleted file mode 100644 index 5809748fa55e..000000000000 --- a/emulators/86Box/files/patch-cmake_flags-gcc-armv7.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/flags-gcc-armv7.cmake.orig 2024-07-26 18:16:08 UTC -+++ cmake/flags-gcc-armv7.cmake -@@ -14,7 +14,4 @@ - # Copyright 2021 David Hrdlička. - # - --string(APPEND CMAKE_C_FLAGS_INIT " -march=armv7-a+fp -mfloat-abi=hard") --string(APPEND CMAKE_CXX_FLAGS_INIT " -march=armv7-a+fp -mfloat-abi=hard") -- - include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake) diff --git a/emulators/86Box/files/patch-cmake_flags-gcc-x86__64.cmake b/emulators/86Box/files/patch-cmake_flags-gcc-x86__64.cmake deleted file mode 100644 index 100bdd0cb47c..000000000000 --- a/emulators/86Box/files/patch-cmake_flags-gcc-x86__64.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/flags-gcc-x86_64.cmake.orig 2024-07-26 18:16:26 UTC -+++ cmake/flags-gcc-x86_64.cmake -@@ -14,7 +14,7 @@ - # Copyright 2021 David Hrdlička. - # - --string(APPEND CMAKE_C_FLAGS_INIT " -m64 -march=x86-64 -msse2 -mfpmath=sse -mstackrealign") --string(APPEND CMAKE_CXX_FLAGS_INIT " -m64 -march=x86-64 -msse2 -mfpmath=sse -mstackrealign") -+string(APPEND CMAKE_C_FLAGS_INIT " -mstackrealign") -+string(APPEND CMAKE_CXX_FLAGS_INIT " -mstackrealign") - - include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake) diff --git a/emulators/86Box/files/patch-cmake_flags-gcc.cmake b/emulators/86Box/files/patch-cmake_flags-gcc.cmake deleted file mode 100644 index d9b56c9c71ed..000000000000 --- a/emulators/86Box/files/patch-cmake_flags-gcc.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/flags-gcc.cmake.orig 2024-07-26 18:17:03 UTC -+++ cmake/flags-gcc.cmake -@@ -16,8 +16,6 @@ string(APPEND CMAKE_CXX_FLAGS_INIT " -fom - # Define our flags - string(APPEND CMAKE_C_FLAGS_INIT " -fomit-frame-pointer -Wall -fno-strict-aliasing -Werror=implicit-int -Werror=implicit-function-declaration -Werror=int-conversion -Werror=strict-prototypes -Werror=old-style-definition") - string(APPEND CMAKE_CXX_FLAGS_INIT " -fomit-frame-pointer -Wall -fno-strict-aliasing") --string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -g0 -O3") --string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -g0 -O3") - string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -ggdb -Og") - string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -ggdb -Og") - string(APPEND CMAKE_C_FLAGS_OPTIMIZED_INIT " -march=native -mtune=native -O3 -ffp-contract=fast -flto") diff --git a/emulators/86Box/files/patch-src_printer_CMakeLists.txt b/emulators/86Box/files/patch-src_printer_CMakeLists.txt deleted file mode 100644 index a6da4a25f91e..000000000000 --- a/emulators/86Box/files/patch-src_printer_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/printer/CMakeLists.txt.orig 2024-08-02 00:15:09 UTC -+++ src/printer/CMakeLists.txt -@@ -29,6 +29,7 @@ target_link_libraries(86Box PkgConfig::FREETYPE) - find_package(PkgConfig REQUIRED) - pkg_check_modules(FREETYPE REQUIRED IMPORTED_TARGET freetype2) - target_link_libraries(86Box PkgConfig::FREETYPE) -+target_include_directories(print PRIVATE ${FREETYPE_INCLUDE_DIRS}) - if(STATIC_BUILD) - # if(QT) - # Qt provides its own version of harfbuzz which leads to duplicated symbols. diff --git a/emulators/86Box/files/patch-src_qt_qt__mainwindow.cpp b/emulators/86Box/files/patch-src_qt_qt__mainwindow.cpp deleted file mode 100644 index e6bbf8c52860..000000000000 --- a/emulators/86Box/files/patch-src_qt_qt__mainwindow.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/qt/qt_mainwindow.cpp.orig 2024-08-02 00:15:09 UTC -+++ src/qt/qt_mainwindow.cpp -@@ -378,6 +378,7 @@ MainWindow::MainWindow(QWidget *parent) - - #if QT_CONFIG(vulkan) - bool vulkanAvailable = false; -+ if (0) - { - QVulkanInstance instance; - instance.setApiVersion(QVersionNumber(1, 0)); |