aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Matsuoka2001-11-06 22:59:59 +0000
committerClaudio Matsuoka2001-11-06 22:59:59 +0000
commitfffb53aa5349d1a9bb8f5e96c9d7dda706538e63 (patch)
tree0c6070de43074d8aff557dcc09e49d720e06c245
parentbddfc49eeacf84e3fda681a5f239c563b5fa8207 (diff)
downloadscummvm-rg350-fffb53aa5349d1a9bb8f5e96c9d7dda706538e63.tar.gz
scummvm-rg350-fffb53aa5349d1a9bb8f5e96c9d7dda706538e63.tar.bz2
scummvm-rg350-fffb53aa5349d1a9bb8f5e96c9d7dda706538e63.zip
Re-added changes to allow cygwin and beos cross-compilation.
svn-id: r3468
-rw-r--r--Makefile10
-rw-r--r--stdafx.h10
2 files changed, 19 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 767bbaa308..1d67f13fc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,17 @@
+# $Id$
+#
+# $Log$
+# Revision 1.9 2001/11/06 22:59:59 cmatsuoka
+# Re-added changes to allow cygwin and beos cross-compilation.
+#
+
CC = gcc
CFLAGS = -g -Wno-multichar
DEFINES = -DUNIX
-LDFLAGS := `sdl-config --libs`
+LDFLAGS :=
INCLUDES:= `sdl-config --cflags`
CPPFLAGS= $(DEFINES) $(INCLUDES)
+LIBS = -lSDL
ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
INCS = scumm.h scummsys.h stdafx.h
diff --git a/stdafx.h b/stdafx.h
index f1f8202370..706422d1dd 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -1,3 +1,11 @@
+/*
+ * $Id$
+ *
+ * $Log$
+ * Revision 1.6 2001/11/06 22:59:59 cmatsuoka
+ * Re-added changes to allow cygwin and beos cross-compilation.
+ *
+ */
#if defined(WIN32)
#if _MSC_VER > 1000
@@ -48,7 +56,9 @@
#endif
#include <sys/types.h>
#include <sys/uio.h>
+#if !defined (__BEOS__)
#include <unistd.h>
+#endif
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>