[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.20,1.21 stdafx.h,1.13,1.14

[Ruediger Hanke]

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

Modified Files:
	gameDetector.cpp stdafx.h 
Log Message:
Reenable MorphOS Midi driver, small updates to CD open code (only when CD audio is requested) and start options

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gameDetector.cpp	17 Apr 2002 14:50:47 -0000	1.20
--- gameDetector.cpp	18 Apr 2002 21:40:23 -0000	1.21
***************
*** 447,450 ****
--- 447,453 ----
  	case MD_WINDOWS:	return MidiDriver_WIN_create();
  #endif
+ #ifdef __MORPHOS__
+ 	case MD_AMIDI:		return MidiDriver_AMIDI_create();
+ #endif
  	}
  

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/stdafx.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** stdafx.h	12 Apr 2002 21:26:34 -0000	1.13
--- stdafx.h	18 Apr 2002 21:40:23 -0000	1.14
***************
*** 3,6 ****
--- 3,9 ----
   *
   * $Log$
+  * Revision 1.14  2002/04/18 21:40:23  tomjoad
+  * Reenable MorphOS Midi driver, small updates to CD open code (only when CD audio is requested) and start options
+  *
   * Revision 1.13  2002/04/12 21:26:34  strigeus
   * new video engine (expect broken non-sdl builds),
***************
*** 93,96 ****
--- 96,103 ----
  #else
  
+ #if defined(__MORPHOS__)
+ #include <devices/timer.h>
+ #undef CMD_INVALID
+ #endif
  #if !defined(__APPLE__CW) && !(defined(__MWERKS__) && defined(macintosh))
  #include <sys/types.h>