mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-23 21:34:18 +08:00
Fix SpaceCadetPinball
This commit is contained in:
parent
12d2be1e8f
commit
9abdbd085e
@ -1,7 +1,8 @@
|
||||
# XXX: Do not distribute https://github.com/k4zmu2a/SpaceCadetPinball/issues/1
|
||||
[source]
|
||||
git = "https://gitlab.redox-os.org/xTibor/SpaceCadetPinball.git"
|
||||
upstream = "https://github.com/k4zmu2a/SpaceCadetPinball.git"
|
||||
branch = "redox"
|
||||
git = "https://github.com/k4zmu2a/SpaceCadetPinball.git"
|
||||
rev = "f760f34e5eb49c69d584921c0f3e251a59c62078"
|
||||
patches = [ "redox.patch" ]
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
@ -16,11 +17,5 @@ dependencies = [
|
||||
]
|
||||
script = """
|
||||
DYNAMIC_INIT
|
||||
COOKBOOK_CONFIGURE_FLAGS=(
|
||||
-DSDL2_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include/SDL2"
|
||||
-DSDL2_LIBRARY="-lSDL2_mixer -lvorbisfile -lvorbis -logg -lSDL2 -lorbital $("${TARGET}-pkg-config" --libs osmesa)"
|
||||
-DSDL2_MIXER_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include/SDL2"
|
||||
-DSDL2_MIXER_LIBRARY="SDL2_mixer"
|
||||
)
|
||||
cookbook_cmake
|
||||
"""
|
||||
|
||||
13
recipes/games/spacecadetpinball/redox.patch
Normal file
13
recipes/games/spacecadetpinball/redox.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3578112..3fe166d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -205,7 +205,7 @@ target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY})
|
||||
# Workaround: CMake treats these SDL2_mixer link flags as build targets for some
|
||||
# reason I was not able to figure out why. I moved these mixer link flags to
|
||||
# the SDL2 linker flags as a workaround.
|
||||
-#target_link_libraries(SpaceCadetPinball ${SDL2_MIXER_LIBRARY})
|
||||
+target_link_libraries(SpaceCadetPinball ${SDL2_MIXER_LIBRARY})
|
||||
|
||||
# On Windows, copy DLL to output
|
||||
if(WIN32)
|
||||
Loading…
Reference in New Issue
Block a user