Skip to content

Commit 7ea0831

Browse files
committed
Use system libs for OpenDingux
1 parent 1f26739 commit 7ea0831

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

CMake/rg350_defs.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
set(WITH_SYSTEM_SDL_TTF ON)
2+
set(WITH_SYSTEM_SDL_GFX ON)
3+
14
set(AUTOSCALE 1)
25
set(FILE_SYSTEM \"/dev/mmcblk1p1\")
36
set(PATH_DEFAULT \"/media/sdcard\")

CMake/rs90_defs.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
set(WITH_SYSTEM_SDL_TTF ON)
2+
set(WITH_SYSTEM_SDL_GFX ON)
3+
14
set(AUTOSCALE 1)
25
set(FILE_SYSTEM \"/dev/mmcblk1p1\")
36
set(PATH_DEFAULT \"/media/sdcard\")

build.sh

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,11 @@ check_buildroot() {
2424

2525
make_buildroot() {
2626
cd "$BUILDROOT"
27-
# Check dependencies manually as it's much faster than `make`.
28-
local -a deps=()
29-
if ! [[ -f output/staging/usr/include/SDL/SDL.h ]]; then
30-
deps+=(sdl)
31-
fi
32-
if ! [[ -f output/staging/usr/include/SDL/SDL_image.h ]]; then
33-
deps+=(sdl_image)
34-
fi
35-
if ! [[ -d output/staging/usr/include/freetype2/ ]]; then
27+
local -a deps=(toolchain sdl sdl_image)
28+
if [[ "$TARGET" == retrofw ]]; then
3629
deps+=(freetype)
37-
fi
38-
if ! [[ -f output/host/usr/share/buildroot/toolchainfile.cmake ]]; then
39-
deps+=(toolchain)
30+
else
31+
deps+=(sdl_ttf sdl_gfx)
4032
fi
4133
if (( ${#deps[@]} )); then
4234
make "${deps[@]}" BR2_JLEVEL=0

targets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ check_target() {
2424
done
2525
echo "Error: invalid target"
2626
return 1
27-
}
27+
}

0 commit comments

Comments
 (0)