[Scummvm-cvs-logs] SF.net SVN: scummvm:[48555] tools/branches/branch-1-1-0
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Apr 5 19:26:08 CEST 2010
Revision: 48555
http://scummvm.svn.sourceforge.net/scummvm/?rev=48555&view=rev
Author: lordhoto
Date: 2010-04-05 17:26:07 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
Backport of r48553 and r48554, which were commits of patches #2982090 and #2982091.
Modified Paths:
--------------
tools/branches/branch-1-1-0/Makefile.common
tools/branches/branch-1-1-0/engines/scumm/compress_scumm_san.cpp
Modified: tools/branches/branch-1-1-0/Makefile.common
===================================================================
--- tools/branches/branch-1-1-0/Makefile.common 2010-04-05 17:19:49 UTC (rev 48554)
+++ tools/branches/branch-1-1-0/Makefile.common 2010-04-05 17:26:07 UTC (rev 48555)
@@ -99,7 +99,7 @@
all: $(TARGETS)
install: $(TARGETS)
- for i in $^ ; do install -p -m 0755 $$i $(DESTDIR) ; done
+ for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR) ; done
bundle_name = ScummVM\ Tools.app
bundle: scummvm-tools$(EXEEXT)
Modified: tools/branches/branch-1-1-0/engines/scumm/compress_scumm_san.cpp
===================================================================
--- tools/branches/branch-1-1-0/engines/scumm/compress_scumm_san.cpp 2010-04-05 17:19:49 UTC (rev 48554)
+++ tools/branches/branch-1-1-0/engines/scumm/compress_scumm_san.cpp 2010-04-05 17:26:07 UTC (rev 48555)
@@ -25,6 +25,7 @@
#include <string.h>
#include <zlib.h>
#include <stdio.h>
+#include <unistd.h>
#include "compress_scumm_san.h"
#include "common/endian.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list