libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

webOS: replace ncpu (go), fix undefined function compile error, use pkg-config from buildroot (#16271)

Browse Source
This commit is contained in:
Craig C 2024-02-24 23:37:53 +00:00 committed by GitHub
parent 14b5feeabf
commit a55dd23db6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.webos
View File

@ -128,7 +128,7 @@ LIBS := -ldl -lz -lrt -pthread
CFLAGS := CFLAGS :=
CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
ASFLAGS := ASFLAGS :=
LDFLAGS := -Wl,--gc-sections LDFLAGS := -Wl,--rpath $ORIGIN/lib,--gc-sections
INCLUDE_DIRS = -I$(WEBOS_INC_DIR) INCLUDE_DIRS = -I$(WEBOS_INC_DIR)
LIBRARY_DIRS = -L$(WEBOS_LIB_DIR) LIBRARY_DIRS = -L$(WEBOS_LIB_DIR)
DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
@ -140,10 +140,12 @@ DEFINES += -DHAVE_PULSE
DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
DEFINES += -DHAVE_UPDATE_CORE_INFO DEFINES += -DHAVE_UPDATE_CORE_INFO
SDL2_CFLAGS := $(shell pkg-config --cflags sdl2) PKG_CONFIG=$(SDKTARGETSYSROOT)/../../bin/pkg-config
SDL2_LIBS := $(shell pkg-config --libs sdl2)
SDL2_CFLAGS := $(shell $(PKG_CONFIG) --cflags sdl2)
SDL2_LIBS := $(shell $(PKG_CONFIG) --libs sdl2)
OPENGLES_LIBS = -lGLESv2 OPENGLES_LIBS = -lGLESv2
PULSE_LIBS = $(shell pkg-config --libs libpulse) PULSE_LIBS = $(shell $(PKG_CONFIG) --libs libpulse)
MMAP_LIBS = -lc MMAP_LIBS = -lc
NEON_CFLAGS = -mfpu=neon NEON_CFLAGS = -mfpu=neon
NEON_ASFLAGS = -mfpu=neon NEON_ASFLAGS = -mfpu=neon
@ -230,6 +232,7 @@ ipk: $(TARGET)
echo "$$APPINFO" > webos/dist/appinfo.json echo "$$APPINFO" > webos/dist/appinfo.json
cp -t webos/dist -vf $(TARGET) webos/icon160.png cp -t webos/dist -vf $(TARGET) webos/icon160.png
cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libstdc++.so.6 cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libstdc++.so.6
cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libSDL2-2.0.so.0
$(STRIP) webos/dist/$(TARGET) $(STRIP) webos/dist/$(TARGET)
cd webos && ares-package dist cd webos && ares-package dist

2
config.def.h
View File

@ -1684,6 +1684,8 @@
#if defined(HAKCHI) #if defined(HAKCHI)
#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/" #define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/"
#elif defined(WEBOS)
#define DEFAULT_BUILDBOT_SERVER_URL "https://www.webosbrew.org/retroarch-cores/armv7a/"
#elif defined(ANDROID) #elif defined(ANDROID)
#if defined(ANDROID_ARM_V7) #if defined(ANDROID_ARM_V7)
#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/" #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/"

5
retroarch.c
View File

@ -8208,8 +8208,11 @@ bool retroarch_main_quit(void)
retroarch_menu_running_finished(true); retroarch_menu_running_finished(true);
#endif #endif
#ifdef HAVE_ACCESSIBILITY #ifdef HAVE_TRANSLATE
translation_release(false); translation_release(false);
#endif
#ifdef HAVE_ACCESSIBILITY
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
if (access_st->image_lock) if (access_st->image_lock)
{ {

2
webos/README.md
View File

@ -1,7 +1,7 @@
## Building ## Building
```sh ```sh
make -f Makefile.webos clean make -f Makefile.webos clean
make -f Makefile.webos -j$(ncpu --all) ipk make -f Makefile.webos -j$(getconf _NPROCESSORS_ONLN) ipk
``` ```
## Testing ## Testing

11
webos/appinfo.json
View File

@ -1,11 +0,0 @@
{
"id": "com.retroarch",
"version": "1.9.8",
"vendor": "libretro.com",
"title": "RetroArch",
"icon": "icon160.png",
"main": "retroarch",
"iconColor": "#333333",
"type": "native",
"appDescription": "Official Libretro frontend"
}