[Scummvm-cvs-logs] CVS: scummvm Makefile,1.8,1.9 stdafx.h,1.5,1.6

[Claudio Matsuoka]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv6657

Modified Files:
	Makefile stdafx.h 
Log Message:
Re-added changes to allow cygwin and beos cross-compilation.


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	2001/11/05 19:21:49	1.8
--- Makefile	2001/11/06 22:59:59	1.9
***************
*** 1,8 ****
  CC	= gcc
  CFLAGS	= -g -Wno-multichar
  DEFINES	= -DUNIX
! LDFLAGS := `sdl-config --libs`
  INCLUDES:= `sdl-config --cflags`
  CPPFLAGS= $(DEFINES) $(INCLUDES)
  ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
  
--- 1,16 ----
+ # $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 := 
  INCLUDES:= `sdl-config --cflags`
  CPPFLAGS= $(DEFINES) $(INCLUDES)
+ LIBS	= -lSDL
  ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
  

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/stdafx.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** stdafx.h	2001/11/05 19:21:49	1.5
--- stdafx.h	2001/11/06 22:59:59	1.6
***************
*** 1,2 ****
--- 1,10 ----
+ /*
+  * $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)
  
***************
*** 49,53 ****
--- 57,63 ----
  #include <sys/types.h>
  #include <sys/uio.h>
+ #if !defined (__BEOS__)
  #include <unistd.h>
+ #endif
  #include <stdio.h>
  #include <fcntl.h>