From 158a8f35be468bce757b5637f5e7c410c44b214a Mon Sep 17 00:00:00 2001
From: Fabio Di Francesco <fabio.difrancesco@gmail.com>
Date: Tue, 13 Aug 2019 16:34:52 +0000
Subject: [PATCH] fix sdl2 asset path
---
recipes/sdl2_gears/{ => assets}/font.ttf | Bin
recipes/sdl2_gears/{ => assets}/image.png | Bin
recipes/sdl2_gears/{ => assets}/music.wav | Bin
recipes/sdl2_gears/gears.c | 6 +++---
recipes/sdl2_gears/recipe.sh | 14 ++++++++------
5 files changed, 11 insertions(+), 9 deletions(-)
rename recipes/sdl2_gears/{ => assets}/font.ttf (100%)
rename recipes/sdl2_gears/{ => assets}/image.png (100%)
rename recipes/sdl2_gears/{ => assets}/music.wav (100%)
diff --git a/recipes/sdl2_gears/font.ttf b/recipes/sdl2_gears/assets/font.ttf
similarity index 100%
rename from recipes/sdl2_gears/font.ttf
rename to recipes/sdl2_gears/assets/font.ttf
diff --git a/recipes/sdl2_gears/image.png b/recipes/sdl2_gears/assets/image.png
similarity index 100%
rename from recipes/sdl2_gears/image.png
rename to recipes/sdl2_gears/assets/image.png
diff --git a/recipes/sdl2_gears/music.wav b/recipes/sdl2_gears/assets/music.wav
similarity index 100%
rename from recipes/sdl2_gears/music.wav
rename to recipes/sdl2_gears/assets/music.wav
diff --git a/recipes/sdl2_gears/gears.c b/recipes/sdl2_gears/gears.c
index 97b798bfc..93faf7e93 100644
--- a/recipes/sdl2_gears/gears.c
+++ b/recipes/sdl2_gears/gears.c
@@ -276,13 +276,13 @@ void CheckSDLError(int line)
}
SDL_Surface *image;
-const char *IMAGE_FILE_NAME = "image.png";
+const char *IMAGE_FILE_NAME = "/games/sdl2_gears/assets/image.png";
Mix_Music *music = NULL;
-const char *MUSIC_FILE_NAME = "music.wav";
+const char *MUSIC_FILE_NAME = "/games/sdl2_gears/assets/music.wav";
TTF_Font *font = NULL;
-const char *TTF_FILE_NAME = "font.ttf";
+const char *TTF_FILE_NAME = "/games/sdl2_gears/assets/font.ttf";
void cleanup()
{
diff --git a/recipes/sdl2_gears/recipe.sh b/recipes/sdl2_gears/recipe.sh
index c5809169d..db33349ce 100644
--- a/recipes/sdl2_gears/recipe.sh
+++ b/recipes/sdl2_gears/recipe.sh
@@ -11,9 +11,11 @@ function recipe_update {
}
function recipe_prepare {
- rm -rf source
+ m -rf source
mkdir source
cp gears.c source
+ mkdir source/assets
+ cp assets/* source/assets
}
function recipe_build {
@@ -30,17 +32,17 @@ function recipe_test {
}
function recipe_clean {
- make clean
+ echo "skipping clean"
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
mkdir -pv "$dest/games/sdl2_gears"
- mkdir -pv "$dest/home/user"
+ mkdir -pv "$dest/games/sdl2_gears/assets"
cp -v "sdl2_gears" "$dest/games/sdl2_gears/sdl2_gears"
- cp -v "../image.png" "$dest/home/user/image.png"
- cp -v "../music.wav" "$dest/home/user/music.wav"
- cp -v "../font.ttf" "$dest/home/user/font.ttf"
+ 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"
skip=1
}
--
GitLab