1 files changed, 36 insertions, 4 deletions

diff --git a/apps/plugins/sdl/sdl.make b/apps/plugins/sdl/sdl.make
index 492284e333..a00948da28 100644
--- a/apps/plugins/sdl/sdl.make
+++ b/apps/plugins/sdl/sdl.make
@@ -13,34 +13,46 @@ SDL_OBJDIR := $(BUILDDIR)/apps/plugins/sdl
 SDL_SRC := $(call preprocess, $(SDL_SRCDIR)/SOURCES)
 DUKE3D_SRC := $(call preprocess, $(SDL_SRCDIR)/SOURCES.duke)
 WOLF3D_SRC := $(call preprocess, $(SDL_SRCDIR)/SOURCES.wolf)
+QUAKE_SRC := $(call preprocess, $(SDL_SRCDIR)/SOURCES.quake)
 
 SDL_OBJ := $(call c2obj, $(SDL_SRC))
 DUKE3D_OBJ = $(call c2obj, $(DUKE3D_SRC))
 WOLF3D_OBJ = $(call c2obj, $(WOLF3D_SRC))
+QUAKE_OBJ = $(call c2obj, $(QUAKE_SRC))
 
 # add source files to OTHER_SRC to get automatic dependencies
-OTHER_SRC += $(SDL_SRC) $(DUKE3D_SRC) $(WOLF3D_SRC)
+OTHER_SRC += $(SDL_SRC) $(DUKE3D_SRC) $(WOLF3D_SRC) $(QUAKE_SRC)
 OTHER_INC += -I$(SDL_SRCDIR)/include
 
 # include comes first because of possible system SDL headers taking
 # precedence
-SDLFLAGS = -I$(SDL_SRCDIR)/include $(filter-out -O%,$(PLUGINFLAGS))     \
--O3 -Wno-unused-parameter -Xpreprocessor -Wno-undef -Wcast-align -w
+# some of these are for Quake only
+SDLFLAGS = -I$(SDL_SRCDIR)/include $(filter-out -O%,$(PLUGINFLAGS))             \
+-O3 -Wno-unused-parameter -Xpreprocessor -Wno-undef -Wcast-align        \
+-ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations       \
+-D_GNU_SOURCE=1 -D_REENTRANT -DSDL -DELF -w # disable all warnings
 
+# use FPU on ARMv6
 ifeq ($(ARCH_VERSION),6)
     SDLFLAGS += -mfloat-abi=softfp
 endif
 
 ifndef APP_TYPE
     ### no target has a big enough plugin buffer
-    ROCKS += $(SDL_OBJDIR)/duke3d.ovl $(SDL_OBJDIR)/wolf3d.ovl
+    ROCKS += $(SDL_OBJDIR)/duke3d.ovl
+    ROCKS += $(SDL_OBJDIR)/wolf3d.ovl
+    ROCKS += $(SDL_OBJDIR)/quake.ovl
+
     DUKE3D_OUTLDS = $(SDL_OBJDIR)/duke3d.link
     WOLF3D_OUTLDS = $(SDL_OBJDIR)/wolf3d.link
+    QUAKE_OUTLDS = $(SDL_OBJDIR)/quake.link
+
     SDL_OVLFLAGS = -Wl,--gc-sections -Wl,-Map,$(basename $@).map
 else
     ### simulator
     ROCKS += $(SDL_OBJDIR)/duke3d.rock
     ROCKS += $(SDL_OBJDIR)/wolf3d.rock
+    ROCKS += $(SDL_OBJDIR)/quake.rock
 endif
 
 # Duke3D
@@ -77,6 +89,26 @@ $(SDL_OBJDIR)/wolf3d.ovl: $(SDL_OBJ) $(WOLF3D_OBJ) $(TLSFLIB) $(WOLF3D_OUTLDS)
                 -lgcc  -T$(WOLF3D_OUTLDS) $(SDL_OVLFLAGS)
         $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@)
 
+# Quake
+###
+
+$(SDL_OBJDIR)/quake.rock: $(SDL_OBJ) $(QUAKE_OBJ) $(TLSFLIB)
+
+$(SDL_OBJDIR)/quake.refmap: $(SDL_OBJ) $(QUAKE_OBJ) $(TLSFLIB)
+
+$(QUAKE_OUTLDS): $(PLUGIN_LDS) $(SDL_OBJDIR)/quake.refmap
+        $(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DOVERLAY_OFFSET=$(shell \
+                $(TOOLSDIR)/ovl_offset.pl $(SDL_OBJDIR)/quake.refmap))
+
+$(SDL_OBJDIR)/quake.ovl: $(SDL_OBJ) $(QUAKE_OBJ) $(TLSFLIB) $(QUAKE_OUTLDS)
+        $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
+                $(filter %.o, $^) \
+                $(filter %.a, $+) \
+                -lgcc -T$(QUAKE_OUTLDS) $(SDL_OVLFLAGS)
+        $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@)
+
+###
+
 # common
 
 $(SDL_OBJDIR)/%.o: $(SDL_SRCDIR)/%.c $(SDL_SRCDIR)/sdl.make $(BUILDDIR)/sysfont.h