From 03d68f44c8c3688f9455d95a524242edc5f4abe0 Mon Sep 17 00:00:00 2001
From: Bradley Bell <bradley.bell@gmail.com>
Date: Thu, 5 Feb 2015 16:45:53 -0800
Subject: [PATCH 1/3] use size_t for indexing array fixes ambiguous call to
 operator[]

---
 similar/arch/sdl/jukebox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/similar/arch/sdl/jukebox.cpp b/similar/arch/sdl/jukebox.cpp
index 12288911d..e484f26f2 100644
--- a/similar/arch/sdl/jukebox.cpp
+++ b/similar/arch/sdl/jukebox.cpp
@@ -109,7 +109,7 @@ const file_extension_t jukebox_exts[7] = { SONG_EXT_HMP, SONG_EXT_MID, SONG_EXT_
 static int read_m3u(void)
 {
 	FILE *fp;
-	uint_fast32_t length;
+	std::size_t length;
 	char *buf;
 	array<char, PATH_MAX> absbuf;
 	if (PHYSFSX_exists(GameCfg.CMLevelMusicPath.data(), 0)) // it's a child of Sharepath, build full path

From e0b3f4f1b4417b512fb4ea8c1cff0bc9ca57706c Mon Sep 17 00:00:00 2001
From: Bradley Bell <bradley.bell@gmail.com>
Date: Thu, 5 Feb 2015 16:54:15 -0800
Subject: [PATCH 2/3] use <cstdlib> instead of <stdlib.h> to use definitions in
 the std namespace

---
 similar/main/gamecntl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/similar/main/gamecntl.cpp b/similar/main/gamecntl.cpp
index 7f86cf25c..0ef773726 100644
--- a/similar/main/gamecntl.cpp
+++ b/similar/main/gamecntl.cpp
@@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include <algorithm>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 #include <stdarg.h>
 

From 625cba6fdff3fa089f36552d678d56a2cbe1f1a5 Mon Sep 17 00:00:00 2001
From: Bradley Bell <bradley.bell@gmail.com>
Date: Thu, 5 Feb 2015 16:59:38 -0800
Subject: [PATCH 3/3] xcode setting for passing network opts to scons

also delete reference to old sconf.log
---
 contrib/dxx-rebirth.xcodeproj/project.pbxproj | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/dxx-rebirth.xcodeproj/project.pbxproj b/contrib/dxx-rebirth.xcodeproj/project.pbxproj
index 18984412c..933374e90 100644
--- a/contrib/dxx-rebirth.xcodeproj/project.pbxproj
+++ b/contrib/dxx-rebirth.xcodeproj/project.pbxproj
@@ -356,7 +356,6 @@
 		14F8AA9F1A2D6320003AA93A /* txb2tex.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = txb2tex.1; sourceTree = "<group>"; };
 		14F8AAA01A2D6320003AA93A /* txb2tex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = txb2tex.c; sourceTree = "<group>"; };
 		14F8AAA31A2D6320003AA93A /* GPL-3.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "GPL-3.txt"; sourceTree = "<group>"; };
-		14F8AAA41A2D6320003AA93A /* sconf.log */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sconf.log; sourceTree = "<group>"; };
 		14F8AAA51A2D6320003AA93A /* SConstruct */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SConstruct; sourceTree = "<group>"; };
 		14F8AAA61A2D6320003AA93A /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
 		14F8AAA71A2D6320003AA93A /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
@@ -489,7 +488,6 @@
 				14F8AA561A2D6320003AA93A /* d1x-rebirth */,
 				14F8AAA21A2D6320003AA93A /* d2x-rebirth */,
 				14F8AAA31A2D6320003AA93A /* GPL-3.txt */,
-				14F8AAA41A2D6320003AA93A /* sconf.log */,
 				14F8AAA51A2D6320003AA93A /* SConstruct */,
 				14F8AB261A2D6320003AA93A /* similar */,
 			);
@@ -1513,7 +1511,8 @@
 				SDKROOT = macosx;
 				dxx_build_dir = "builddir=build/$(PRODUCT_NAME)";
 				dxx_build_type = "debug=True editor=False";
-				scons_args = "$(dxx_build_target) $(dxx_build_renderer) $(dxx_build_type) $(dxx_build_dir)";
+				dxx_net_opts = "ipv6=False use_udp=True use_tracker=True";
+				scons_args = "$(dxx_build_target) $(dxx_build_renderer) $(dxx_build_type) $(dxx_build_dir) $(dxx_net_opts)";
 			};
 			name = Debug;
 		};
@@ -1550,7 +1549,8 @@
 				SDKROOT = macosx;
 				dxx_build_dir = "builddir=build/$(PRODUCT_NAME)";
 				dxx_build_type = "debug=False editor=False";
-				scons_args = "$(dxx_build_target) $(dxx_build_renderer) $(dxx_build_type) $(dxx_build_dir)";
+				dxx_net_opts = "ipv6=False use_udp=True use_tracker=True";
+				scons_args = "$(dxx_build_target) $(dxx_build_renderer) $(dxx_build_type) $(dxx_build_dir) $(dxx_net_opts)";
 			};
 			name = Release;
 		};
@@ -1593,7 +1593,8 @@
 				SDKROOT = macosx;
 				dxx_build_dir = "builddir=build/$(PRODUCT_NAME)";
 				dxx_build_type = "debug=True editor=True";
-				scons_args = "$(dxx_build_target) $(dxx_build_renderer) $(dxx_build_type) $(dxx_build_dir)";
+				dxx_net_opts = "ipv6=False use_udp=True use_tracker=True";
+				scons_args = "$(dxx_build_target) $(dxx_build_renderer) $(dxx_build_type) $(dxx_build_dir) $(dxx_net_opts)";
 			};
 			name = Editor;
 		};