diff options
| author | Ali Mohammad Pur <ali.mpfard@gmail.com> | 2022-05-16 19:21:26 +0430 |
|---|---|---|
| committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2022-05-19 20:17:10 +0430 |
| commit | 1dc03216abc9cab77cbf3e69cfc725cf2569b821 (patch) | |
| tree | 4ee042bdfdae86279e0faf136929368b08973af2 | |
| parent | 3a879faba6b94d3e9cfdcc99c07fe1a1917296ea (diff) | |
| download | serenity-1dc03216abc9cab77cbf3e69cfc725cf2569b821.zip | |
Ports: Update Another-World's patches to use git patches
| -rw-r--r-- | Ports/Another-World/patches/0001-Skip-using-find_package-for-SDL2.patch | 29 | ||||
| -rw-r--r-- | Ports/Another-World/patches/ReadMe.md | 9 | ||||
| -rw-r--r-- | Ports/Another-World/patches/fix_cmakelists.patch | 15 |
3 files changed, 38 insertions, 15 deletions
diff --git a/Ports/Another-World/patches/0001-Skip-using-find_package-for-SDL2.patch b/Ports/Another-World/patches/0001-Skip-using-find_package-for-SDL2.patch new file mode 100644 index 0000000000..54c0cbe844 --- /dev/null +++ b/Ports/Another-World/patches/0001-Skip-using-find_package-for-SDL2.patch @@ -0,0 +1,29 @@ +From a85ea6751a9628b9a6ff3caede0a1365490d3cec Mon Sep 17 00:00:00 2001 +From: Pavel Safar <safar.pavel@gmail.com> +Date: Mon, 7 Jun 2021 14:26:26 +0200 +Subject: [PATCH] Skip using find_package() for SDL2 + +We pass the include directory via cmake flags, so we can just use that +and link against sdl2 normally. +--- + CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 38f6ba8..d0d8463 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,8 +24,7 @@ add_executable(raw + src/vm.cpp + ) + +-find_package(SDL2 REQUIRED) +-include_directories(${SDL2_INCLUDE_DIRS}) +-target_link_libraries(raw ${SDL2_LIBRARIES}) ++include_directories(${SDL2_INCLUDE_DIR}) ++target_link_libraries(raw SDL2) + target_link_libraries(raw z) + +-- +2.36.1 + diff --git a/Ports/Another-World/patches/ReadMe.md b/Ports/Another-World/patches/ReadMe.md new file mode 100644 index 0000000000..99f872d032 --- /dev/null +++ b/Ports/Another-World/patches/ReadMe.md @@ -0,0 +1,9 @@ +# Patches for Another-World on SerenityOS + +## `0001-Skip-using-find_package-for-SDL2.patch` + +Skip using find_package() for SDL2 + +We pass the include directory via cmake flags, so we can just use that +and link against sdl2 normally. + diff --git a/Ports/Another-World/patches/fix_cmakelists.patch b/Ports/Another-World/patches/fix_cmakelists.patch deleted file mode 100644 index c1158b184b..0000000000 --- a/Ports/Another-World/patches/fix_cmakelists.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 38f6ba8..d56ca64 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,8 +24,7 @@ add_executable(raw - src/vm.cpp - ) - --find_package(SDL2 REQUIRED) --include_directories(${SDL2_INCLUDE_DIRS}) --target_link_libraries(raw ${SDL2_LIBRARIES}) -+include_directories(${SDL2_INCLUDE_DIR}) -+target_link_libraries(raw SDL2) - target_link_libraries(raw z) - |