|
14 | 14 | WEBOS_FREETYPE_CONFIG ?= $(STAGING_DIR)/usr/bin/freetype-config |
15 | 15 |
|
16 | 16 | 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 |
18 | 19 |
|
19 | 20 | ADD_SDL2_LIB ?= 0 |
20 | 21 | 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_ |
145 | 146 | ASFLAGS := $(ARCHFLAGS) |
146 | 147 | LDFLAGS := -Wl,-rpath=\$$ORIGIN/lib,--gc-sections |
147 | 148 | INCLUDE_DIRS = -I$(WEBOS_INC_DIR) |
148 | | -LIBRARY_DIRS = -L$(WEBOS_LIB_DIR) |
| 149 | +LIBRARY_DIRS = -L$(WEBOS_USR_LIB_DIR) |
149 | 150 | DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY |
150 | 151 | DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1 -D_GNU_SOURCE |
151 | 152 | DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1 |
@@ -285,7 +286,8 @@ ipk: $(TARGET) sdl2 |
285 | 286 | mkdir -p webos/dist/lib |
286 | 287 | echo "$$APPINFO" > webos/dist/appinfo.json |
287 | 288 | 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 |
289 | 291 | ifeq ($(ADD_SDL2_LIB), 1) |
290 | 292 | cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0 |
291 | 293 | endif |
|
0 commit comments