diff --git a/platforms/libretro/Makefile b/platforms/libretro/Makefile
index 778127c2..ba473adb 100644
--- a/platforms/libretro/Makefile
+++ b/platforms/libretro/Makefile
@@ -243,8 +243,8 @@ OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_CXX:.cpp=.o)
 
 INCLUDES += -I$(SOURCE_DIR)
 
-CFLAGS   += -Wall -D__LIBRETRO__ $(fpic)
-CXXFLAGS += -Wall -D__LIBRETRO__ $(fpic)
+CFLAGS   += -DGEARBOY_DISABLE_DISASSEMBLER -Wall -D__LIBRETRO__ $(fpic)
+CXXFLAGS += -DGEARBOY_DISABLE_DISASSEMBLER -Wall -D__LIBRETRO__ $(fpic)
 
 all: $(TARGET)
 
diff --git a/platforms/libretro/libretro.cpp b/platforms/libretro/libretro.cpp
index cb7e7772..dfe2fdc9 100644
--- a/platforms/libretro/libretro.cpp
+++ b/platforms/libretro/libretro.cpp
@@ -32,7 +32,6 @@
 #endif
 #include "libretro.h"
 
-#define GEARBOY_DISABLE_DISASSEMBLER
 #include "../../src/gearboy.h"
 
 #define VIDEO_WIDTH 160
diff --git a/platforms/raspberrypi/Makefile b/platforms/raspberrypi/Makefile
index 1064588c..431c954f 100644
--- a/platforms/raspberrypi/Makefile
+++ b/platforms/raspberrypi/Makefile
@@ -4,7 +4,7 @@ GEARBOY_RPI_SRC=.
 
 include $(GEARBOY_RPI_SRC)/Makefile.common
 
-CFLAGS+=-Wall -O3 -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard
+CFLAGS+=-Wall -O3 -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DGEARBOY_DISABLE_DISASSEMBLER
 
 LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmEGL -lbrcmGLESv2 -lopenmaxil -lvcos -lvchiq_arm -lm -lrt -lconfig++ -lbcm_host `sdl2-config --libs`
 
diff --git a/platforms/raspberrypi/main.cpp b/platforms/raspberrypi/main.cpp
index edbbe2b3..746277c3 100644
--- a/platforms/raspberrypi/main.cpp
+++ b/platforms/raspberrypi/main.cpp
@@ -34,7 +34,6 @@
 #include "EGL/egl.h"
 #include "EGL/eglext.h"
 
-#define GEARBOY_DISABLE_DISASSEMBLER
 #include "gearboy.h"
 #include "../audio-shared/Sound_Queue.h"
 
diff --git a/platforms/raspberrypi2/Makefile b/platforms/raspberrypi2/Makefile
index 038f12ec..621c7d8b 100644
--- a/platforms/raspberrypi2/Makefile
+++ b/platforms/raspberrypi2/Makefile
@@ -4,7 +4,7 @@ GEARBOY_RPI_SRC=../raspberrypi
 
 include $(GEARBOY_RPI_SRC)/Makefile.common
 
-CFLAGS+=-Wall -O3 -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
+CFLAGS+=-Wall -O3 -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -DGEARBOY_DISABLE_DISASSEMBLER
 
 LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmEGL -lbrcmGLESv2 -lopenmaxil -lvcos -lvchiq_arm -lm -lrt -lconfig++ -lbcm_host `sdl2-config --libs`
 
diff --git a/platforms/raspberrypi3/x64/Makefile b/platforms/raspberrypi3/x64/Makefile
index bbd21603..a638581a 100644
--- a/platforms/raspberrypi3/x64/Makefile
+++ b/platforms/raspberrypi3/x64/Makefile
@@ -4,7 +4,7 @@ GEARBOY_RPI_SRC=../../raspberrypi
 
 include $(GEARBOY_RPI_SRC)/Makefile.common
 
-CFLAGS+=-Wall -O3 -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+CFLAGS+=-Wall -O3 -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -DGEARBOY_DISABLE_DISASSEMBLER
 
 LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmEGL -lbrcmGLESv2 -lopenmaxil -lvcos -lvchiq_arm -lm -lrt -lconfig++ -lbcm_host `sdl2-config --libs`
 
diff --git a/platforms/raspberrypi3/x86/Makefile b/platforms/raspberrypi3/x86/Makefile
index 2bdfe1ce..2aa6e205 100644
--- a/platforms/raspberrypi3/x86/Makefile
+++ b/platforms/raspberrypi3/x86/Makefile
@@ -4,7 +4,7 @@ GEARBOY_RPI_SRC=../../raspberrypi
 
 include $(GEARBOY_RPI_SRC)/Makefile.common
 
-CFLAGS+=-Wall -O3 -march=armv7-a -mtune=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard
+CFLAGS+=-Wall -O3 -march=armv7-a -mtune=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard -DGEARBOY_DISABLE_DISASSEMBLER
 
 LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmEGL -lbrcmGLESv2 -lopenmaxil -lvcos -lvchiq_arm -lm -lrt -lconfig++ -lbcm_host `sdl2-config --libs`