mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 10:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rpath on webOS and making sdl2 lib copy optional (#16294)

Browse Source
This commit is contained in:
Craig C 2024-02-27 05:00:18 +00:00 committed by GitHub
parent 2e90ec9202
commit 2e710f46a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.webos
View File

@ -7,6 +7,8 @@ WEBOS_FREETYPE_CONFIG ?= $(SDKTARGETSYSROOT)/usr/bin/freetype-config
WEBOS_INC_DIR ?= $(SDKTARGETSYSROOT)/usr/include WEBOS_INC_DIR ?= $(SDKTARGETSYSROOT)/usr/include
WEBOS_LIB_DIR ?= $(SDKTARGETSYSROOT)/usr/lib WEBOS_LIB_DIR ?= $(SDKTARGETSYSROOT)/usr/lib
ADD_SDL2_LIB ?= 0
######################### #########################
######################### #########################
@ -128,7 +130,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,--rpath $ORIGIN/lib,--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
@ -232,7 +234,9 @@ 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
ifeq ($(ADD_SDL2_LIB), 1)
cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libSDL2-2.0.so.0 cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libSDL2-2.0.so.0
endif
$(STRIP) webos/dist/$(TARGET) $(STRIP) webos/dist/$(TARGET)
cd webos && ares-package dist cd webos && ares-package dist