Skip to content

Commit e4f1f25

Browse files
authored
webOS: Update to use new buildroot naming, add libatomic (#18157)
* webOS: add libatomic from toolchain for ppsspp * webOS: Update naming scheme for buildroot
1 parent 64c15f5 commit e4f1f25

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Makefile.webos

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ endif
1414
WEBOS_FREETYPE_CONFIG ?= $(STAGING_DIR)/usr/bin/freetype-config
1515

1616
WEBOS_INC_DIR ?= $(STAGING_DIR)/usr/include
17-
WEBOS_LIB_DIR ?= $(STAGING_DIR)/usr/lib
17+
WEBOS_USR_LIB_DIR ?= $(STAGING_DIR)/usr/lib
18+
WEBOS_LIB_DIR ?= $(STAGING_DIR)/lib
1819

1920
ADD_SDL2_LIB ?= 0
2021
SDL2_PREBUILT_ARCHIVE ?= https://github.com/webosbrew/SDL-webOS/releases/download/release-2.30.12-webos.1/SDL2-2.30.12-webos-abi.tar.gz
@@ -145,7 +146,7 @@ CXXFLAGS := $(ARCHFLAGS) -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_
145146
ASFLAGS := $(ARCHFLAGS)
146147
LDFLAGS := -Wl,-rpath=\$$ORIGIN/lib,--gc-sections
147148
INCLUDE_DIRS = -I$(WEBOS_INC_DIR)
148-
LIBRARY_DIRS = -L$(WEBOS_LIB_DIR)
149+
LIBRARY_DIRS = -L$(WEBOS_USR_LIB_DIR)
149150
DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
150151
DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1 -D_GNU_SOURCE
151152
DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
@@ -285,7 +286,8 @@ ipk: $(TARGET) sdl2
285286
mkdir -p webos/dist/lib
286287
echo "$$APPINFO" > webos/dist/appinfo.json
287288
cp -t webos/dist -vf $(TARGET) webos/icon160.png
288-
cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libstdc++.so.6
289+
cp -t webos/dist/lib -vf $(WEBOS_USR_LIB_DIR)/libstdc++.so.6
290+
cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libatomic.so.1
289291
ifeq ($(ADD_SDL2_LIB), 1)
290292
cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0
291293
endif

0 commit comments

Comments
 (0)