Mirrors/moonlight-nx
2
0
Fork 0
mirror of https://github.com/rock88/moonlight-nx synced 2024-11-22 11:33:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build

Browse source
This commit is contained in:
rock88 2020-05-05 23:39:38 +03:00
parent eb1ec7130b
commit f12fc190a4
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -53,16 +53,15 @@ else ifneq (,$(findstring osx,$(platform)))
fpic += -mmacosx-version-min=10.12
# Lakka Switch
else ifeq ($(platform), lakka-switch)
LAKKA_ROOT := /home/rock88/Documents/Lakka-LibreELEC/build.Lakka-L4T.aarch64-2.2-devel
LAKKA_TOOLCHAIN := $(LAKKA_ROOT)/toolchain
CC = $(LAKKA_TOOLCHAIN)/bin/aarch64-libreelec-linux-gnueabi-gcc
CXX = $(LAKKA_TOOLCHAIN)/bin/aarch64-libreelec-linux-gnueabi-c++
TOOLCHAIN := /home/rock88/Documents/Lakka-LibreELEC/build.Lakka-L4T.aarch64-2.2-devel/toolchain
CC = $(TOOLCHAIN)/bin/aarch64-libreelec-linux-gnueabi-gcc
CXX = $(TOOLCHAIN)/bin/aarch64-libreelec-linux-gnueabi-c++
TARGET := $(TARGET_NAME)_libretro.so
DEFINES += -mcpu=cortex-a57+crypto+crc+fp+simd -mabi=lp64 -Wno-psabi -mtune=cortex-a57 \
-march=armv8-a+crypto+crc+fp+simd -fomit-frame-pointer -Wall -pipe -fPIC -pthread \
-D__LAKKA_SWITCH__
INCLUDES += -I$(LAKKA_TOOLCHAIN)/aarch64-libreelec-linux-gnueabi/sysroot/usr/include \
-I$(LAKKA_TOOLCHAIN)/include -Ithird_party/opus/include
INCLUDES += -I$(TOOLCHAIN)/aarch64-libreelec-linux-gnueabi/sysroot/usr/include \
-I$(TOOLCHAIN)/include -Ithird_party/opus/include
LIBS += -lpthread -lGL -luuid -Lthird_party/opus/lib
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
else
@ -193,7 +192,8 @@ INCLUDES += \
-Ithird_party/moonlight-common-c/src \
-Ithird_party/moonlight-common-c/enet/include \
-Ithird_party/nanogui/include \
-Ithird_party/nanogui/ext/nanovg/src
-Ithird_party/nanogui/ext/nanovg/src \
-Ithird_party/json/single_include/nlohmann
C_SOURCES = $(LIBGAMESTREAM_SOURCES) $(MOONLIGHT_LIBRETRO_C_SOURCES) $(MOONLIGHT_COMMON_C_SOURCES) $(NANOGUI_C_SOURCES)
CXX_SOURCES = $(MOONLIGHT_LIBRETRO_CXX_SOURCES) $(NANOGUI_CXX_SOURCES)

10
build_opus_lakka_switch.sh
View file

@ -5,13 +5,13 @@ git clone https://github.com/xiph/opus.git opus_tmp
cd opus_tmp
./autogen.sh
# Fix LAKKA_TOOLCHAIN path!
LAKKA_TOOLCHAIN=/home/rock88/Documents/Lakka-LibreELEC/build.Lakka-L4T.aarch64-2.2-devel/toolchain
# Fix TOOLCHAIN path!
TOOLCHAIN=/home/rock88/Documents/Lakka-LibreELEC/build.Lakka-L4T.aarch64-2.2-devel/toolchain
CFLAGS='-mcpu=cortex-a57+crypto+crc+fp+simd -mabi=lp64 -Wno-psabi -mtune=cortex-a57 -march=armv8-a+crypto+crc+fp+simd -fomit-frame-pointer -Wall -pipe -O2 -mcpu=cortex-a57 -fPIC' \
ASFLAGS='-mcpu=cortex-a57+crypto+crc+fp+simd -mabi=lp64 -Wno-psabi -mtune=cortex-a57 -march=armv8-a+crypto+crc+fp+simd -fomit-frame-pointer -Wall -pipe -O2 -mcpu=cortex-a57 -fPIC' \
CC=$LAKKA_TOOLCHAIN/bin/aarch64-libreelec-linux-gnueabi-gcc \
LD=$LAKKA_TOOLCHAIN/bin/aarch64-libreelec-linux-gnueabi-ld \
AR=$LAKKA_TOOLCHAIN/bin/aarch64-libreelec-linux-gnueabi-ar \
CC=$TOOLCHAIN/bin/aarch64-libreelec-linux-gnueabi-gcc \
LD=$TOOLCHAIN/bin/aarch64-libreelec-linux-gnueabi-ld \
AR=$TOOLCHAIN/bin/aarch64-libreelec-linux-gnueabi-ar \
./configure --host=aarch64-libreelec-linux-gnueabi --prefix=$INSTALL_DIR
make install
cd ..

4
moonlight.xcodeproj/project.pbxproj
View file

@ -282,6 +282,7 @@
36A0C0392461E4C00083289C /* SettingsWindow.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = SettingsWindow.hpp; sourceTree = "<group>"; };
36A0C03B2461F03C0083289C /* Settings.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Settings.cpp; sourceTree = "<group>"; };
36A0C03C2461F03C0083289C /* Settings.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Settings.hpp; sourceTree = "<group>"; };
36A0C03E2461FFF10083289C /* build_opus_lakka_switch.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = build_opus_lakka_switch.sh; sourceTree = "<group>"; };
36A5630B245F194000901354 /* gl_render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl_render.h; sourceTree = "<group>"; };
36A5630C245F194000901354 /* gl_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gl_render.c; sourceTree = "<group>"; };
36A5630D245F194000901354 /* audio_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio_decoder.h; sourceTree = "<group>"; };
@ -646,6 +647,7 @@
isa = PBXGroup;
children = (
3602C3C0245DC7E300368900 /* Makefile */,
36A0C03E2461FFF10083289C /* build_opus_lakka_switch.sh */,
3652F006245C2918001FABF3 /* libgamestream */,
36B406932459F41E005BD903 /* src */,
36DFDCF62459F80600FC51CE /* third_party */,
@ -951,6 +953,7 @@
"\"$(SRCROOT)/src/nanogui_resources\"",
"\"$(SRCROOT)/third_party/moonlight-common-c/enet/include\"",
"\"$(SRCROOT)/third_party/moonlight-common-c/src\"",
"\"$(SRCROOT)/third_party/json/single_include/nlohmann\"",
);
LIBRARY_SEARCH_PATHS = (
/usr/local/lib,
@ -1040,6 +1043,7 @@
"\"$(SRCROOT)/src/nanogui_resources\"",
"\"$(SRCROOT)/third_party/moonlight-common-c/enet/include\"",
"\"$(SRCROOT)/third_party/moonlight-common-c/src\"",
"\"$(SRCROOT)/third_party/json/single_include/nlohmann\"",
);
LIBRARY_SEARCH_PATHS = (
/usr/local/lib,