Raspberry Pi Support (#117)

This commit is contained in:
Isaac0-dev 2022-06-06 12:40:21 +10:00 committed by GitHub
parent 8928f7d207
commit a40c3cf121
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 4 deletions

View file

@ -353,13 +353,18 @@ else
endif endif
ifeq ($(HEADLESS),1) ifeq ($(HEADLESS),1)
$(warning Compiling headless) $(info Compiling headless)
RENDER_API := DUMMY RENDER_API := DUMMY
WINDOW_API := DUMMY WINDOW_API := DUMMY
AUDIO_API := DUMMY AUDIO_API := DUMMY
CONTROLLER_API := CONTROLLER_API :=
endif endif
ifeq ($(TARGET_RPI),1)
$(info Compiling for Raspberry Pi)
DISCORD_SDK := 0
endif
# NON_MATCHING - whether to build a matching, identical copy of the ROM # NON_MATCHING - whether to build a matching, identical copy of the ROM
# 1 - enable some alternate, more portable code that does not produce a matching ROM # 1 - enable some alternate, more portable code that does not produce a matching ROM
# 0 - build a matching ROM # 0 - build a matching ROM
@ -641,6 +646,8 @@ else ifeq ($(OSX_BUILD),1)
# I copied the library and gave it two names. # I copied the library and gave it two names.
# This really shouldn't be required, but I got tired of trying to do it the "right way" # This really shouldn't be required, but I got tired of trying to do it the "right way"
BASS_LIBS := lib/bass/bass.dylib lib/bass/libbass.dylib lib/bass/bass_fx.dylib lib/bass/libbass_fx.dylib BASS_LIBS := lib/bass/bass.dylib lib/bass/libbass.dylib lib/bass/bass_fx.dylib lib/bass/libbass_fx.dylib
else ifeq ($(TARGET_RPI),1)
BASS_LIBS := lib/bass/arm/libbass.so lib/bass/arm/libbass_fx.so
else else
BASS_LIBS := lib/bass/libbass.so lib/bass/libbass_fx.so BASS_LIBS := lib/bass/libbass.so lib/bass/libbass_fx.so
endif endif
@ -940,6 +947,8 @@ ifeq ($(WINDOWS_BUILD),1)
endif endif
else ifeq ($(OSX_BUILD),1) else ifeq ($(OSX_BUILD),1)
LDFLAGS += -L./lib/lua/mac/ -l lua53 LDFLAGS += -L./lib/lua/mac/ -l lua53
else ifeq ($(TARGET_RPI),1)
LDFLAGS += -Llib/lua/linux -l:liblua53-arm.a
else else
LDFLAGS += -Llib/lua/linux -l:liblua53.a LDFLAGS += -Llib/lua/linux -l:liblua53.a
endif endif
@ -955,10 +964,14 @@ ifeq ($(WINDOWS_BUILD),1)
else else
ifeq ($(DISCORD_SDK),1) ifeq ($(DISCORD_SDK),1)
LDFLAGS += -ldiscord_game_sdk -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/discordsdk -Wl,-rpath lib/bass LDFLAGS += -ldiscord_game_sdk -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/discordsdk -Wl,-rpath lib/bass
else
ifeq ($(TARGET_RPI),1)
LDFLAGS += -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/bass/arm
else else
LDFLAGS += -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/bass LDFLAGS += -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/bass
endif endif
endif endif
endif
# Prevent a crash with -sopt # Prevent a crash with -sopt
export LANG := C export LANG := C
@ -1034,6 +1047,12 @@ ifeq ($(DEVELOPMENT),1)
CFLAGS += -DDEVELOPMENT CFLAGS += -DDEVELOPMENT
endif endif
# Check for rpi option
ifeq ($(TARGET_RPI),1)
CC_CHECK_CFLAGS += -DTARGET_RPI
CFLAGS += -DTARGET_RPI
endif
# Check for lua profiler option # Check for lua profiler option
ifeq ($(LUA_PROFILER),1) ifeq ($(LUA_PROFILER),1)
CC_CHECK_CFLAGS += -DLUA_PROFILER CC_CHECK_CFLAGS += -DLUA_PROFILER

View file

@ -136,13 +136,14 @@ PackData* DynOS_Pack_Add(const SysPath& aPath) {
auto& _DynosPacks = DynosPacks(); auto& _DynosPacks = DynosPacks();
s32 index = _DynosPacks.Count(); s32 index = _DynosPacks.Count();
_DynosPacks.Add({ const PackData packData = {
.mIndex = index, .mIndex = index,
.mPath = aPath, .mPath = aPath,
.mGfxData = {}, .mGfxData = {},
.mTextures = {}, .mTextures = {},
.mLoaded = false, .mLoaded = false,
}); };
_DynosPacks.Add(packData);
PackData* _Pack = &_DynosPacks[index]; PackData* _Pack = &_DynosPacks[index];

BIN
lib/bass/arm/libbass.so Normal file

Binary file not shown.

BIN
lib/bass/arm/libbass_fx.so Normal file

Binary file not shown.

Binary file not shown.