Merge pull request #18031 from webosbrew/webos
webOS: Improve compatibility, add debug build option, fix wrong arg removed, fix LF on Makefile.webos
This commit is contained in:
commit
ceb99a0644
|
@ -66,6 +66,8 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
. /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
|
. /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
|
||||||
make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN)
|
make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN)
|
||||||
|
env:
|
||||||
|
DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
|
||||||
|
|
||||||
- name: Get short SHA
|
- name: Get short SHA
|
||||||
id: slug
|
id: slug
|
||||||
|
|
|
@ -288,7 +288,9 @@ ipk: $(TARGET) sdl2
|
||||||
ifeq ($(ADD_SDL2_LIB), 1)
|
ifeq ($(ADD_SDL2_LIB), 1)
|
||||||
cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0
|
cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0
|
||||||
endif
|
endif
|
||||||
|
ifneq ($(DEBUG), 1)
|
||||||
$(STRIP) webos/dist/$(TARGET)
|
$(STRIP) webos/dist/$(TARGET)
|
||||||
|
endif
|
||||||
cd webos && ares-package dist
|
cd webos && ares-package dist
|
||||||
|
|
||||||
install: ipk
|
install: ipk
|
||||||
|
|
|
@ -5928,6 +5928,11 @@ int rarch_main(int argc, char *argv[], void *data)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(WEBOS)
|
#if defined(WEBOS)
|
||||||
|
// compatibility with webOS 3 - 5
|
||||||
|
if(getenv("XDG_RUNTIME_DIR") == NULL) {
|
||||||
|
setenv("XDG_RUNTIME_DIR", "/tmp/xdg", 0);
|
||||||
|
}
|
||||||
|
|
||||||
struct rlimit limit = {0, 0};
|
struct rlimit limit = {0, 0};
|
||||||
setrlimit(RLIMIT_CORE, &limit);
|
setrlimit(RLIMIT_CORE, &limit);
|
||||||
#endif
|
#endif
|
||||||
|
@ -7046,7 +7051,7 @@ static bool retroarch_parse_input_and_config(
|
||||||
BSV_MOVIE_ARG NETPLAY_ARG DYNAMIC_ARG FFMPEG_RECORD_ARG CONFIG_FILE_ARG;
|
BSV_MOVIE_ARG NETPLAY_ARG DYNAMIC_ARG FFMPEG_RECORD_ARG CONFIG_FILE_ARG;
|
||||||
|
|
||||||
#if defined(WEBOS)
|
#if defined(WEBOS)
|
||||||
if (argv[1][0] == '{')
|
if (argc > 1 && argv[1][0] == '{')
|
||||||
{
|
{
|
||||||
argv = &(argv[1]);
|
argv = &(argv[1]);
|
||||||
argc = argc - 1;
|
argc = argc - 1;
|
||||||
|
|
Loading…
Reference in New Issue