diff --git a/Makefile.webos b/Makefile.webos index e260d1aa96..f8fe7dd559 100644 --- a/Makefile.webos +++ b/Makefile.webos @@ -128,7 +128,7 @@ LIBS := -ldl -lz -lrt -pthread CFLAGS := CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS ASFLAGS := -LDFLAGS := -Wl,--gc-sections +LDFLAGS := -Wl,--rpath $ORIGIN/lib,--gc-sections INCLUDE_DIRS = -I$(WEBOS_INC_DIR) LIBRARY_DIRS = -L$(WEBOS_LIB_DIR) 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_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 @@ -230,6 +232,7 @@ ipk: $(TARGET) echo "$$APPINFO" > webos/dist/appinfo.json 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)/libSDL2-2.0.so.0 $(STRIP) webos/dist/$(TARGET) cd webos && ares-package dist diff --git a/config.def.h b/config.def.h index 8b3ae93978..3066aac75d 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://www.webosbrew.org/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 fd719ec483..7db48fa2c2 100644 --- a/retroarch.c +++ b/retroarch.c @@ -8208,8 +8208,11 @@ bool retroarch_main_quit(void) retroarch_menu_running_finished(true); #endif -#ifdef HAVE_ACCESSIBILITY +#ifdef HAVE_TRANSLATE translation_release(false); +#endif + +#ifdef HAVE_ACCESSIBILITY #ifdef HAVE_THREADS if (access_st->image_lock) { diff --git a/webos/README.md b/webos/README.md index 47a9dc7762..f4c83b0c7c 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 79ab0fae82..0000000000 --- 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" -}