diff --git a/recipes/demos/sdl2-gears/gears.c b/recipes/demos/sdl2-gears/gears.c index 93faf7e9360741f723359c502ddec70edc2bc716..887e00854d1de198a84948adb424609d4df550ff 100644 --- a/recipes/demos/sdl2-gears/gears.c +++ b/recipes/demos/sdl2-gears/gears.c @@ -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() { diff --git a/recipes/demos/sdl2-gears/recipe.sh b/recipes/demos/sdl2-gears/recipe.sh index 6da36dd23731f2a95802e63ae5289708fdf2f764..949a00727025269f1dc4dd8fd3faa1cf7a1586cc 100644 --- a/recipes/demos/sdl2-gears/recipe.sh +++ b/recipes/demos/sdl2-gears/recipe.sh @@ -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 } diff --git a/recipes/games/classicube/manifest b/recipes/games/classicube/manifest index e089d08486d5e4a6c12ff30604d52919a3833de3..681eca1be40a8d5d0af23886df920e6581a5d2ae 100644 --- a/recipes/games/classicube/manifest +++ b/recipes/games/classicube/manifest @@ -1,4 +1,4 @@ name=ClassiCube category=Games -binary=/games/classicube/ClassiCube +binary=/usr/games/classicube/ClassiCube icon=/ui/icons/apps/classicube.png diff --git a/recipes/games/classicube/recipe.toml b/recipes/games/classicube/recipe.toml index c65eb8e697efa62bd89352c3a67c1ace54da5fe7..591968213592a5136441b9ef4ef57dfaa28d1032 100644 --- a/recipes/games/classicube/recipe.toml +++ b/recipes/games/classicube/recipe.toml @@ -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" diff --git a/recipes/games/eduke32/manifest b/recipes/games/eduke32/manifest index abb25f8f97a6566ce24d49df8e6506af652a6496..27dfe096c2397a149cc9b2b82fe89c8977da0d8d 100644 --- a/recipes/games/eduke32/manifest +++ b/recipes/games/eduke32/manifest @@ -1,4 +1,4 @@ name=EDuke32 category=Games -binary=/games/eduke32 +binary=/usr/games/eduke32 icon=/ui/icons/apps/eduke32.png diff --git a/recipes/games/eduke32/recipe.toml b/recipes/games/eduke32/recipe.toml index e150b2c87f963fad085b24975fbc0e098c104754..b0532d44b9fbb6d46d0b43af49cd618838ceac98 100644 --- a/recipes/games/eduke32/recipe.toml +++ b/recipes/games/eduke32/recipe.toml @@ -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" diff --git a/recipes/games/freedoom/recipe.toml b/recipes/games/freedoom/recipe.toml index 3a4be6ed4588a123a57d214abbf2ff272e84b88f..fdba3bed068b48dec108b75c1545ec0d2655acab 100644 --- a/recipes/games/freedoom/recipe.toml +++ b/recipes/games/freedoom/recipe.toml @@ -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" diff --git a/recipes/games/gigalomania/manifest b/recipes/games/gigalomania/manifest index 345713ee145060b93050c79fcea7aed87fcfdd60..94fb93b6920243531e1e738ce91a492fccf7acf9 100644 --- a/recipes/games/gigalomania/manifest +++ b/recipes/games/gigalomania/manifest @@ -1,4 +1,4 @@ name=Gigalomania category=Games -binary=/games/gigalomania/gigalomania +binary=/usr/games/gigalomania/gigalomania icon=/ui/icons/apps/gigalomania.png diff --git a/recipes/games/gigalomania/recipe.sh b/recipes/games/gigalomania/recipe.sh index e43d67164547a27c41c92ba6cdc9419e33f1ba1f..d29aad066008045bb9df7f09a3efb89d50340077 100644 --- a/recipes/games/gigalomania/recipe.sh +++ b/recipes/games/gigalomania/recipe.sh @@ -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" diff --git a/recipes/games/neverball/manifest-neverball b/recipes/games/neverball/manifest-neverball index 70330ee2ad09acebbefdc8bc7605e1413d76883c..431aadb308f37b87ebdca0389191fd9f3edeb77a 100644 --- a/recipes/games/neverball/manifest-neverball +++ b/recipes/games/neverball/manifest-neverball @@ -1,4 +1,4 @@ name=Neverball category=Games -binary=/games/neverball/neverball +binary=/usr/games/neverball/neverball icon=/ui/icons/apps/neverball.png diff --git a/recipes/games/neverball/manifest-neverputt b/recipes/games/neverball/manifest-neverputt index f0c0febc3faba09fcd3e620c37f9490545bff973..debe4f67317ffd3bffebd87e38128dc53d8ab141 100644 --- a/recipes/games/neverball/manifest-neverputt +++ b/recipes/games/neverball/manifest-neverputt @@ -1,4 +1,4 @@ name=Neverputt category=Games -binary=/games/neverball/neverputt +binary=/usr/games/neverball/neverputt icon=/ui/icons/apps/neverputt.png diff --git a/recipes/games/neverball/recipe.sh b/recipes/games/neverball/recipe.sh index 4c12afda1cf3aa13cff387983c15d4c279b0ee67..ba83e15e8faec05ec9d214e094c93cb9cab09608 100644 --- a/recipes/games/neverball/recipe.sh +++ b/recipes/games/neverball/recipe.sh @@ -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}" diff --git a/recipes/games/openttd/manifest b/recipes/games/openttd/manifest index 7f25f35567f694647bb73277621934173a231a55..79405498dfd4c2731085e8868b6cb614a3f600bd 100644 --- a/recipes/games/openttd/manifest +++ b/recipes/games/openttd/manifest @@ -1,4 +1,4 @@ name=OpenTTD category=Games -binary=/games/openttd +binary=/usr/games/openttd icon=/ui/icons/apps/openttd.png diff --git a/recipes/games/openttd/recipe.sh b/recipes/games/openttd/recipe.sh index bd15e67e3657dbac129d3dc88aeda90e71833f6e..ff766abf95fb345ffe8faac835bb8c94364b2ba0 100644 --- a/recipes/games/openttd/recipe.sh +++ b/recipes/games/openttd/recipe.sh @@ -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" diff --git a/recipes/games/prboom/recipe.sh b/recipes/games/prboom/recipe.sh index c2ce128a6e819108b0206799143296253cdd44b2..319f2103e4610ea3f9f9d2551972a023c6ec45c3 100644 --- a/recipes/games/prboom/recipe.sh +++ b/recipes/games/prboom/recipe.sh @@ -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 } diff --git a/recipes/games/vvvvvv/recipe.sh b/recipes/games/vvvvvv/recipe.sh index 28649e57625cfe2ebcf6813255df8849a58776a6..531e3697be1d776d668d4b743d822c665556d564 100644 --- a/recipes/games/vvvvvv/recipe.sh +++ b/recipes/games/vvvvvv/recipe.sh @@ -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 }