From: Matthew Mondor <mmondor@pulsar-zone.net>
Date: Sun, 29 Jun 2014 23:56:13 +0000 (+0000)
Subject: - Resume BUILDING instructions
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=a1a26d07fc9d9be809a74db0997aa4daa23cd0d2;p=mmondor.git

- Resume BUILDING instructions
- Use SDL_Delay() vs sleep(3) which is missing in win32/mingw
- Add missing stdint.h headerfile include in screen.h
---

diff --git a/mmsoftware/mystic_ships/client/BUILDING b/mmsoftware/mystic_ships/client/BUILDING
index 54a0965..8e2ea78 100644
--- a/mmsoftware/mystic_ships/client/BUILDING
+++ b/mmsoftware/mystic_ships/client/BUILDING
@@ -1,4 +1,4 @@
-$Id: BUILDING,v 1.2 2014/06/27 02:06:02 mmondor Exp $
+$Id: BUILDING,v 1.3 2014/06/29 23:56:13 mmondor Exp $
 
 
 NetBSD
@@ -79,6 +79,24 @@ executables on other Linux systems.
 OSX
 ===
 
+Install Xcode from the App Store, as well as the Xcode command line
+utilities.  For more information, see:
+http://stackoverflow.com/questions/9329243/xcode-4-4-and-later-install-command-line-tools
+Alternatively, the xcrun command prefix may be needed to access
+some preinstalled command line utilities.
+
+Install the Brew package manager from http://brew.sh
+
+Install the SDL library dependencies using brew:
+% brew install sdl sdl_gfx sdl_image sdl_mixer sdl_net
+Make sure that the libvorbis+libogg dependencies were also installed
+using the "brew list" command.
+
+Go to the client/ directory, modify src/conf.h as necessary, then
+run "make".
+
+[...]
+
 
 WINDOWS
 =======
diff --git a/mmsoftware/mystic_ships/client/src/screen.c b/mmsoftware/mystic_ships/client/src/screen.c
index cf2e2d4..318614e 100644
--- a/mmsoftware/mystic_ships/client/src/screen.c
+++ b/mmsoftware/mystic_ships/client/src/screen.c
@@ -1,4 +1,4 @@
-/* $Id: screen.c,v 1.3 2014/06/25 11:52:24 mmondor Exp $ */
+/* $Id: screen.c,v 1.4 2014/06/29 23:56:13 mmondor Exp $ */
 
 /*
  * Copyright (c) 2006, 2014, Matthew Mondor
@@ -14,7 +14,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include <SDL.h>
 #include <SDL_gfxPrimitives.h>
@@ -98,7 +97,7 @@ screen_error(const char *fmt, ...)
 	if (error_font != NULL) {
 		font_blit_string(error_font, 32, 32, buf,
 		    0xff, 0x0a, 0x0a, 0xff);
-		(void) sleep(3);
+		SDL_Delay(3000);
 	} else
 		(void) fprintf(stderr, "%s\n", buf);
 	exit(EXIT_FAILURE);
diff --git a/mmsoftware/mystic_ships/client/src/screen.h b/mmsoftware/mystic_ships/client/src/screen.h
index 57cc6c2..9691098 100644
--- a/mmsoftware/mystic_ships/client/src/screen.h
+++ b/mmsoftware/mystic_ships/client/src/screen.h
@@ -1,4 +1,4 @@
-/* $Id: screen.h,v 1.2 2014/06/25 11:52:24 mmondor Exp $ */
+/* $Id: screen.h,v 1.3 2014/06/29 23:56:13 mmondor Exp $ */
 
 /*
  * Copyright (c) 2006, Matthew Mondor
@@ -16,6 +16,8 @@
 
 
 
+#include <stdint.h>
+
 #include <SDL.h>