diff --git a/Makefile b/Makefile
index 240b9725..912048ac 100644
--- a/Makefile
+++ b/Makefile
@@ -353,13 +353,18 @@ else
 endif
 
 ifeq ($(HEADLESS),1)
-  $(warning Compiling headless)
+  $(info Compiling headless)
   RENDER_API := DUMMY
   WINDOW_API := DUMMY
   AUDIO_API := DUMMY
   CONTROLLER_API := 
 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
 #   1 - enable some alternate, more portable code that does not produce 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.
   # 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
+else ifeq ($(TARGET_RPI),1)
+  BASS_LIBS := lib/bass/arm/libbass.so lib/bass/arm/libbass_fx.so
 else
   BASS_LIBS := lib/bass/libbass.so lib/bass/libbass_fx.so
 endif
@@ -940,6 +947,8 @@ ifeq ($(WINDOWS_BUILD),1)
   endif
 else ifeq ($(OSX_BUILD),1)
   LDFLAGS += -L./lib/lua/mac/ -l lua53
+else ifeq ($(TARGET_RPI),1)
+  LDFLAGS += -Llib/lua/linux -l:liblua53-arm.a
 else
   LDFLAGS += -Llib/lua/linux -l:liblua53.a
 endif
@@ -956,7 +965,11 @@ else
   ifeq ($(DISCORD_SDK),1)
     LDFLAGS += -ldiscord_game_sdk -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/discordsdk -Wl,-rpath lib/bass
   else
-    LDFLAGS += -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/bass
+    ifeq ($(TARGET_RPI),1)
+      LDFLAGS += -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/bass/arm
+    else
+      LDFLAGS += -lbass -lbass_fx -Wl,-rpath . -Wl,-rpath lib/bass
+    endif
   endif
 endif
 
@@ -1034,6 +1047,12 @@ ifeq ($(DEVELOPMENT),1)
   CFLAGS += -DDEVELOPMENT
 endif
 
+# Check for rpi option
+ifeq ($(TARGET_RPI),1)
+  CC_CHECK_CFLAGS += -DTARGET_RPI
+  CFLAGS += -DTARGET_RPI
+endif
+
 # Check for lua profiler option
 ifeq ($(LUA_PROFILER),1)
   CC_CHECK_CFLAGS += -DLUA_PROFILER
diff --git a/data/dynos_mgr_pack.cpp b/data/dynos_mgr_pack.cpp
index 5dadf919..118a240d 100644
--- a/data/dynos_mgr_pack.cpp
+++ b/data/dynos_mgr_pack.cpp
@@ -136,13 +136,14 @@ PackData* DynOS_Pack_Add(const SysPath& aPath) {
 
     auto& _DynosPacks = DynosPacks();
     s32 index = _DynosPacks.Count();
-    _DynosPacks.Add({
+    const PackData packData = {
         .mIndex = index,
         .mPath = aPath,
         .mGfxData = {},
         .mTextures = {},
         .mLoaded = false,
-    });
+    };
+    _DynosPacks.Add(packData);
 
     PackData* _Pack = &_DynosPacks[index];
 
diff --git a/lib/bass/arm/libbass.so b/lib/bass/arm/libbass.so
new file mode 100644
index 00000000..78ca8910
Binary files /dev/null and b/lib/bass/arm/libbass.so differ
diff --git a/lib/bass/arm/libbass_fx.so b/lib/bass/arm/libbass_fx.so
new file mode 100644
index 00000000..0a78d8f4
Binary files /dev/null and b/lib/bass/arm/libbass_fx.so differ
diff --git a/lib/lua/linux/liblua53-arm.a b/lib/lua/linux/liblua53-arm.a
new file mode 100644
index 00000000..e4199bf0
Binary files /dev/null and b/lib/lua/linux/liblua53-arm.a differ