diff --git a/stella/src/macosx/stella.pbproj/project.pbxproj b/stella/src/macosx/stella.pbproj/project.pbxproj
index 15c74bf30..bffb6b0c7 100755
--- a/stella/src/macosx/stella.pbproj/project.pbxproj
+++ b/stella/src/macosx/stella.pbproj/project.pbxproj
@@ -242,7 +242,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = .;
 				OPTIMIZATION_CFLAGS = "-O3";
-				OTHER_CFLAGS = "-DMAC_OSX -DJOYSTICK_SUPPORT -DSOUND_SUPPORT -DDISPLAY_OPENGL -DDEBUGGER_SUPPORT -DCHEATCODE_SUPPORT -DHAVE_GETTIMEOFDAY -DBSPF_MAC_OSX -DHAVE_INTTYPES ";
+				OTHER_CFLAGS = "-DMAC_OSX -DJOYSTICK_SUPPORT -DSOUND_SUPPORT -WINDOWED_SUPPORT -DDISPLAY_OPENGL -DDEBUGGER_SUPPORT -DCHEATCODE_SUPPORT -DHAVE_GETTIMEOFDAY -DBSPF_MAC_OSX -DHAVE_INTTYPES ";
 				OTHER_LDFLAGS = "-framework SDL -lz";
 				PRODUCT_NAME = StellaOSX;
 				SECTORDER_FLAGS = "";
diff --git a/stella/src/macosx/stella.xcodeproj/project.pbxproj b/stella/src/macosx/stella.xcodeproj/project.pbxproj
index 3778771f9..f47588849 100644
--- a/stella/src/macosx/stella.xcodeproj/project.pbxproj
+++ b/stella/src/macosx/stella.xcodeproj/project.pbxproj
@@ -323,6 +323,23 @@
 		};
 /* End PBXBuildRule section */
 
+/* Begin PBXBuildStyle section */
+		DC12C9BE0C4FCC1B00566B98 /* Development */ = {
+			isa = PBXBuildStyle;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+			};
+			name = Development;
+		};
+		DC12C9BF0C4FCC1B00566B98 /* Deployment */ = {
+			isa = PBXBuildStyle;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+			};
+			name = Deployment;
+		};
+/* End PBXBuildStyle section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		2D91751309BA90380026E9FF /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -1273,6 +1290,12 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 2D91752109BA903B0026E9FF /* Build configuration list for PBXProject "stella" */;
+			buildSettings = {
+			};
+			buildStyles = (
+				DC12C9BE0C4FCC1B00566B98 /* Development */,
+				DC12C9BF0C4FCC1B00566B98 /* Deployment */,
+			);
 			hasScannedForEncodings = 1;
 			mainGroup = 29B97314FDCFA39411CA2CEA /* «PROJECTNAMEASXML» */;
 			projectDirPath = "";
@@ -1499,6 +1522,7 @@
 					MAC_OSX,
 					JOYSTICK_SUPPORT,
 					SOUND_SUPPORT,
+					WINDOWED_SUPPORT,
 					DISPLAY_OPENGL,
 					CHEATCODE_SUPPORT,
 					DEBUGGER_SUPPORT,
@@ -1556,6 +1580,7 @@
 					MAC_OSX,
 					JOYSTICK_SUPPORT,
 					SOUND_SUPPORT,
+					WINDOWED_SUPPORT,
 					DISPLAY_OPENGL,
 					CHEATCODE_SUPPORT,
 					DEBUGGER_SUPPORT,
@@ -1611,6 +1636,7 @@
 					MAC_OSX,
 					JOYSTICK_SUPPORT,
 					SOUND_SUPPORT,
+					WINDOWED_SUPPORT,
 					DISPLAY_OPENGL,
 					CHEATCODE_SUPPORT,
 					DEBUGGER_SUPPORT,