diff --git a/Makefile.webos b/Makefile.webos index e260d1aa962..c9678d81649 100644 --- a/Makefile.webos +++ b/Makefile.webos @@ -140,10 +140,12 @@ DEFINES += -DHAVE_PULSE DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES DEFINES += -DHAVE_UPDATE_CORE_INFO -SDL2_CFLAGS := $(shell pkg-config --cflags sdl2) -SDL2_LIBS := $(shell pkg-config --libs sdl2) +PKG_CONFIG=$(SDKTARGETSYSROOT)/../../bin/pkg-config + +SDL2_CFLAGS := $(shell $(PKG_CONFIG) --cflags sdl2) +SDL2_LIBS := $(shell $(PKG_CONFIG) --libs sdl2) OPENGLES_LIBS = -lGLESv2 -PULSE_LIBS = $(shell pkg-config --libs libpulse) +PULSE_LIBS = $(shell $(PKG_CONFIG) --libs libpulse) MMAP_LIBS = -lc NEON_CFLAGS = -mfpu=neon NEON_ASFLAGS = -mfpu=neon diff --git a/config.def.h b/config.def.h index 8b3ae939781..d8d4082b2aa 100644 --- a/config.def.h +++ b/config.def.h @@ -1684,6 +1684,8 @@ #if defined(HAKCHI) #define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/" +#elif defined(WEBOS) +#define DEFAULT_BUILDBOT_SERVER_URL "https://csdougliss.github.io/webos-retroarch-cores/armv7a/" #elif defined(ANDROID) #if defined(ANDROID_ARM_V7) #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/" diff --git a/retroarch.c b/retroarch.c index fd719ec483a..b7a43421fbc 100644 --- a/retroarch.c +++ b/retroarch.c @@ -8208,7 +8208,7 @@ bool retroarch_main_quit(void) retroarch_menu_running_finished(true); #endif -#ifdef HAVE_ACCESSIBILITY +#ifdef HAVE_TRANSLATE translation_release(false); #ifdef HAVE_THREADS if (access_st->image_lock) diff --git a/webos/README.md b/webos/README.md index 47a9dc7762e..f4c83b0c7c8 100644 --- a/webos/README.md +++ b/webos/README.md @@ -1,7 +1,7 @@ ## Building ```sh make -f Makefile.webos clean -make -f Makefile.webos -j$(ncpu --all) ipk +make -f Makefile.webos -j$(getconf _NPROCESSORS_ONLN) ipk ``` ## Testing diff --git a/webos/appinfo.json b/webos/appinfo.json deleted file mode 100644 index 79ab0fae82c..00000000000 --- a/webos/appinfo.json +++ /dev/null @@ -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" -}