diff options
| -rw-r--r-- | backends/platform/sdl/amigaos/amigaos-main.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/sdl/amigaos/amigaos.mk | 18 | ||||
| -rwxr-xr-x | configure | 4 |
3 files changed, 14 insertions, 11 deletions
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp index 0743b3f9a0..65da6bbf85 100644 --- a/backends/platform/sdl/amigaos/amigaos-main.cpp +++ b/backends/platform/sdl/amigaos/amigaos-main.cpp @@ -30,6 +30,9 @@ int main(int argc, char *argv[]) { + // Set up a stack cookie to avoid crashes due to too few stack set by users + static const char *stack_cookie __attribute__((used)) = "$STACK: 600000"; + // Create our OSystem instance g_system = new OSystem_AmigaOS(); assert(g_system); diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk index f84747c9b2..e998c6f3b2 100644 --- a/backends/platform/sdl/amigaos/amigaos.mk +++ b/backends/platform/sdl/amigaos/amigaos.mk @@ -1,12 +1,12 @@ # Special target to create an AmigaOS snapshot installation -amigaos4dist: $(EXECUTABLE) - mkdir -p $(AMIGAOS4PATH) - mkdir -p $(AMIGAOS4PATH)/themes - mkdir -p $(AMIGAOS4PATH)/extras - $(STRIP) $(EXECUTABLE) -o $(AMIGAOS4PATH)/$(EXECUTABLE) - cp ${srcdir}/icons/scummvm.info $(AMIGAOS4PATH)/$(EXECUTABLE).info - cp $(DIST_FILES_THEMES) $(AMIGAOS4PATH)/themes/ +amigaosdist: $(EXECUTABLE) + mkdir -p $(AMIGAOSPATH) + mkdir -p $(AMIGAOSPATH)/themes + mkdir -p $(AMIGAOSPATH)/extras + $(STRIP) $(EXECUTABLE) -o $(AMIGAOSPATH)/$(EXECUTABLE) + cp ${srcdir}/icons/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info + cp $(DIST_FILES_THEMES) $(AMIGAOSPATH)/themes/ ifdef DIST_FILES_ENGINEDATA - cp $(DIST_FILES_ENGINEDATA) $(AMIGAOS4PATH)/extras/ + cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/ endif - cp $(DIST_FILES_DOCS) $(AMIGAOS4PATH) + cp $(DIST_FILES_DOCS) $(AMIGAOSPATH) @@ -168,7 +168,7 @@ _as="as" _windres=windres _stagingpath="staging" _win32path="c:/scummvm" -_amigaos4path="Games:ScummVM" +_amigaospath="Games:ScummVM" _staticlibpath= _sdlconfig=sdl-config _freetypeconfig=freetype-config @@ -4502,7 +4502,7 @@ WINDRES := $_windres WINDRESFLAGS := $WINDRESFLAGS STAGINGPATH=$_stagingpath WIN32PATH=$_win32path -AMIGAOS4PATH=$_amigaos4path +AMIGAOSPATH=$_amigaospath STATICLIBPATH=$_staticlibpath BACKEND := $_backend |