MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-19 19:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'move_games' into 'master'

Browse Source 
Move games from /games to /usr/games

See merge request redox-os/cookbook!333
This commit is contained in:
Jeremy Soller 2024-01-04 15:27:17 +00:00
commit a486f50bbd
16 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/demos/sdl2-gears/gears.c
View File

@ -276,13 +276,13 @@ void CheckSDLError(int line)
}
SDL_Surface *image;
const char *IMAGE_FILE_NAME = "/games/sdl2_gears/assets/image.png";
const char *IMAGE_FILE_NAME = "/usr/games/sdl2_gears/assets/image.png";
Mix_Music *music = NULL;
const char *MUSIC_FILE_NAME = "/games/sdl2_gears/assets/music.wav";
const char *MUSIC_FILE_NAME = "/usr/games/sdl2_gears/assets/music.wav";
TTF_Font *font = NULL;
const char *TTF_FILE_NAME = "/games/sdl2_gears/assets/font.ttf";
const char *TTF_FILE_NAME = "/usr/games/sdl2_gears/assets/font.ttf";
void cleanup()
{

12
recipes/demos/sdl2-gears/recipe.sh
View File

@ -28,11 +28,11 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
mkdir -pv "$dest/games/sdl2_gears"
mkdir -pv "$dest/games/sdl2_gears/assets"
cp -v "sdl2_gears" "$dest/games/sdl2_gears/sdl2_gears"
cp -v "assets/image.png" "$dest/games/sdl2_gears/assets/image.png"
cp -v "assets/music.wav" "$dest/games/sdl2_gears/assets/music.wav"
cp -v "assets/font.ttf" "$dest/games/sdl2_gears/assets/font.ttf"
mkdir -pv "$dest/usr/games/sdl2_gears"
mkdir -pv "$dest/usr/games/sdl2_gears/assets"
cp -v "sdl2_gears" "$dest/usr/games/sdl2_gears/sdl2_gears"
cp -v "assets/image.png" "$dest/usr/games/sdl2_gears/assets/image.png"
cp -v "assets/music.wav" "$dest/usr/games/sdl2_gears/assets/music.wav"
cp -v "assets/font.ttf" "$dest/usr/games/sdl2_gears/assets/font.ttf"
skip=1
}

2
recipes/games/classicube/manifest
View File

@ -1,4 +1,4 @@
name=ClassiCube
category=Games
binary=/games/classicube/ClassiCube
binary=/usr/games/classicube/ClassiCube
icon=/ui/icons/apps/classicube.png

4
recipes/games/classicube/recipe.toml
View File

@ -15,8 +15,8 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -C src redox
mkdir -pv "${COOKBOOK_STAGE}/games/classicube"
cp -v "src/ClassiCube" "${COOKBOOK_STAGE}/games/classicube"
mkdir -pv "${COOKBOOK_STAGE}/usr/games/classicube"
cp -v "src/ClassiCube" "${COOKBOOK_STAGE}/usr/games/classicube"
mkdir -pv "${COOKBOOK_STAGE}/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/classicube"

2
recipes/games/eduke32/manifest
View File

@ -1,4 +1,4 @@
name=EDuke32
category=Games
binary=/games/eduke32
binary=/usr/games/eduke32
icon=/ui/icons/apps/eduke32.png

6
recipes/games/eduke32/recipe.toml
View File

@ -23,9 +23,9 @@ export SDLCONFIG="${COOKBOOK_SYSROOT}/bin/sdl-config --prefix=${COOKBOOK_SYSROOT
PLATFORM=REDOX "${COOKBOOK_MAKE}" -j"$($NPROC)"
mkdir -pv "${COOKBOOK_STAGE}/games"
cp -v ./eduke32 "${COOKBOOK_STAGE}/games/eduke32"
cp -v ./mapster32 "${COOKBOOK_STAGE}/games/mapster32"
mkdir -pv "${COOKBOOK_STAGE}/usr/games"
cp -v ./eduke32 "${COOKBOOK_STAGE}/usr/games/eduke32"
cp -v ./mapster32 "${COOKBOOK_STAGE}/usr/games/mapster32"
mkdir -pv "${COOKBOOK_STAGE}/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/eduke32"

8
recipes/games/freedoom/recipe.toml
View File

@ -4,7 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/freedoom.git"
[build]
template = "custom"
script = """
mkdir -pv "${COOKBOOK_STAGE}/games" "${COOKBOOK_STAGE}/share/games/doom" "${COOKBOOK_STAGE}/ui/apps" "${COOKBOOK_STAGE}/ui/icons/apps"
mkdir -pv "${COOKBOOK_STAGE}/usr/games" "${COOKBOOK_STAGE}/share/games/doom" "${COOKBOOK_STAGE}/ui/apps" "${COOKBOOK_STAGE}/ui/icons/apps"
for file in "${COOKBOOK_SOURCE}/"*.wad
do
game="$(basename "$file" .wad)"
@ -12,14 +12,14 @@ do
wad="/share/games/doom/$game.wad"
cp -v "$file" "${COOKBOOK_STAGE}$wad"
bin="/games/$game"
bin="/usr/games/$game"
echo "#!/bin/ion" > "${COOKBOOK_STAGE}$bin"
echo "/games/prboom -geom 800x600 -vidmode 32 -iwad $wad" >> "${COOKBOOK_STAGE}$bin"
echo "/usr/games/prboom -geom 800x600 -vidmode 32 -iwad $wad" >> "${COOKBOOK_STAGE}$bin"
chmod +x "${COOKBOOK_STAGE}$bin"
echo "name=$game" | sed 's/freedoom/FreeDOOM: Phase /' | sed 's/doom1/DOOM (Shareware)/' > "${COOKBOOK_STAGE}/ui/apps/$game"
echo "category=Games" >> "${COOKBOOK_STAGE}/ui/apps/$game"
echo "binary=/games/$game" >> "${COOKBOOK_STAGE}/ui/apps/$game"
echo "binary=/usr/games/$game" >> "${COOKBOOK_STAGE}/ui/apps/$game"
echo "icon=/ui/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/ui/apps/$game"
cp -v "${COOKBOOK_SOURCE}/$game.png" "${COOKBOOK_STAGE}/ui/icons/apps/$game.png"

2
recipes/games/gigalomania/manifest
View File

@ -1,4 +1,4 @@
name=Gigalomania
category=Games
binary=/games/gigalomania/gigalomania
binary=/usr/games/gigalomania/gigalomania
icon=/ui/icons/apps/gigalomania.png

2
recipes/games/gigalomania/recipe.sh
View File

@ -26,7 +26,7 @@ function recipe_stage {
dest="$(realpath $1)"
bundledir="$dest/bundle"
"$REDOX_MAKE" VERBOSE=1 DESTDIR="$dest" install
"$REDOX_MAKE" VERBOSE=1 DESTDIR="$dest/usr" install
rm -rf "$bundledir"
mkdir -pv "$1/ui/apps"

2
recipes/games/neverball/manifest-neverball
View File

@ -1,4 +1,4 @@
name=Neverball
category=Games
binary=/games/neverball/neverball
binary=/usr/games/neverball/neverball
icon=/ui/icons/apps/neverball.png

2
recipes/games/neverball/manifest-neverputt
View File

@ -1,4 +1,4 @@
name=Neverputt
category=Games
binary=/games/neverball/neverputt
binary=/usr/games/neverball/neverputt
icon=/ui/icons/apps/neverputt.png

6
recipes/games/neverball/recipe.sh
View File

@ -32,16 +32,16 @@ function recipe_stage {
dest="$(realpath $1)"
# Create install directories
mkdir -pv "${dest}/games/neverball" "${dest}/ui/apps" "${dest}/ui/icons/apps"
mkdir -pv "${dest}/usr/games/neverball" "${dest}/ui/apps" "${dest}/ui/icons/apps"
# Copy assets
cp -rv data "${dest}/games/neverball"
cp -rv data "${dest}/usr/games/neverball"
# For each game
for bin in neverball neverputt
do
# Install binary
"${STRIP}" -v "${bin}" -o "${dest}/games/neverball/${bin}"
"${STRIP}" -v "${bin}" -o "${dest}/usr/games/neverball/${bin}"
# Install manifest
cp -v "${COOKBOOK_RECIPE}/manifest-${bin}" "${dest}/ui/apps/${bin}"

2
recipes/games/openttd/manifest
View File

@ -1,4 +1,4 @@
name=OpenTTD
category=Games
binary=/games/openttd
binary=/usr/games/openttd
icon=/ui/icons/apps/openttd.png

2
recipes/games/openttd/recipe.sh
View File

@ -33,7 +33,7 @@ function recipe_stage {
dest="$(realpath $1)"
bundledir="$dest/bundle"
"$REDOX_MAKE" VERBOSE=1 ROOT_DIR="$dest/../build/" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest" install
"$REDOX_MAKE" VERBOSE=1 ROOT_DIR="$dest/../build/" BUNDLE_DIR="$bundledir" INSTALL_DIR="$dest/usr" install
rm -rf "$bundledir"
mkdir -pv "$1/ui/apps"

2
recipes/games/prboom/recipe.sh
View File

@ -35,6 +35,6 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
"$REDOX_MAKE" DESTDIR="$dest" install
"$REDOX_MAKE" DESTDIR="$dest/usr" install
skip=1
}

4
recipes/games/vvvvvv/recipe.sh
View File

@ -32,7 +32,7 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
mkdir -pv "$1/games/vvvvvv"
cp ./desktop_version/VVVVVV "$1/games/vvvvvv"
mkdir -pv "$1/usr/games/vvvvvv"
cp ./desktop_version/VVVVVV "$1/usr/games/vvvvvv"
skip=1
}