[Scummvm-cvs-logs] scummvm master -> bda6debd7e1a4e1ae69e87739a0726d39d940dbb

sev- sev at scummvm.org
Sat Aug 9 15:37:25 CEST 2014


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
13d01576b0 AMIGAOS: Get rid of the OS version number
38f7a9bc70 AMIGAOS: Cleanup of the AmigaOS version number
cbae401a79 AMIGAOS: Add a stack cookie
bda6debd7e Merge pull request #489 from raziel-/patch-1


Commit: 13d01576b0b4b8b988d0fd37e5a1ec928cae2cc7
    https://github.com/scummvm/scummvm/commit/13d01576b0b4b8b988d0fd37e5a1ec928cae2cc7
Author: raziel- (raziel- at users.noreply.github.com)
Date: 2014-08-08T13:50:27+03:00

Commit Message:
AMIGAOS: Get rid of the OS version number

"4" is the version of the OS. It will certainly change with future updates.

Changed paths:
    configure



diff --git a/configure b/configure
index 87c4a0e..541d1c2 100755
--- a/configure
+++ b/configure
@@ -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


Commit: 38f7a9bc705f6b79e21d229dc40afcf6decfc241
    https://github.com/scummvm/scummvm/commit/38f7a9bc705f6b79e21d229dc40afcf6decfc241
Author: raziel- (raziel- at users.noreply.github.com)
Date: 2014-08-08T14:05:23+03:00

Commit Message:
AMIGAOS: Cleanup of the AmigaOS version number

Changed paths:
    backends/platform/sdl/amigaos/amigaos.mk



diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index f84747c..e998c6f 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)


Commit: cbae401a797ffbb262cf05f0707da41f3483d6ee
    https://github.com/scummvm/scummvm/commit/cbae401a797ffbb262cf05f0707da41f3483d6ee
Author: raziel- (raziel- at users.noreply.github.com)
Date: 2014-08-08T13:43:59+01:00

Commit Message:
AMIGAOS: Add a stack cookie

Setting up a static stack to avoid crashes from a stack set too low.

Changed paths:
    backends/platform/sdl/amigaos/amigaos-main.cpp



diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index 0743b3f..65da6bb 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);


Commit: bda6debd7e1a4e1ae69e87739a0726d39d940dbb
    https://github.com/scummvm/scummvm/commit/bda6debd7e1a4e1ae69e87739a0726d39d940dbb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-08-09T15:36:57+02:00

Commit Message:
Merge pull request #489 from raziel-/patch-1

AMIGAOS: Stack cookie and no more AmigaOS version number

Changed paths:
    backends/platform/sdl/amigaos/amigaos-main.cpp
    backends/platform/sdl/amigaos/amigaos.mk
    configure









More information about the Scummvm-git-logs mailing list