fixed up info.plist and the xcodeproj

platform/macosx/Info.plist

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>????</string>
+			</array>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>love</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Love Project</string>
+			<key>CFBundleTypeIconFile</key>
+			<string></string>
+			<key>LSIsAppleDefaultForType</key>
+			<true/>
+			<key>LSTypeIsPackage</key>
+			<true/>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>love</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.love2d.love</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>love</string>
+	<key>CFBundlePackageType</key>
+	<string>LoVe</string>
+	<key>CFBundleSignature</key>
+	<string>LoVe</string>
+	<key>CFBundleVersion</key>
+	<string>0.6.0</string>
+	<key>NSMainNibFile</key>
+	<string>SDLMain</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

platform/macosx/README.rtf

@@ -1,49 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 ArialMT;}
-{\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww11900\viewh14740\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\f0\b\fs24 \cf0 XCode Project for LOVE 
-\b0 02/11/2008\
-\
-Requires Mac OS X 10.4 (Can try 10.3.9 if you want... though; only 10.4 is tested)\
-\
-Required frameworks reside in the Frameworks folder inside the love.app package. (Right click love.app and select "Show Package Contents" to view love.app as a folder)\
-\
-Requires XCode 3.1. download from http://developer.apple.com/iphone/program/ (Can try older version if you want but it is only confirmed to work on XCode 3.1)\
-\
-Put these frameworks inside /Library/Frameworks.\
-\
-Open the XCode project. There maybe some paths that were accidentally left absolute; In this case, the files would be highlighted red. Unfortunately the xcode project haven't been checked thoroughly yet, so you will need to fix these up yourself and redirect the paths to the correct ones. You will need your wits.\
-\
-Fix up source code. See change I had to make at bottom of this document\
-\
-Click build on the toolbar.\
-\
-It should compile fine, hopefully. \
-\
-
-\b Now, open up the terminal after compiling and cd to the macosx folder. \ul type "./script.sh" .\ulnone \
-
-\b0 \
-It will edit the link paths of the love executable so love can be run on any computer, rather than only ones with the required frameworks inside /Library/Framework. (There is also some erroneous libs that got linked even though they are not needed, and this script also removes those links, somewhat crudely).\
-\
-I apologise for this to be somewhat cumbersome; This is my first shell script. Apparently XCode can be set up so when you click build, and script is run automatically. I do not know how to do that, yet.\
-\
-The love.app inside ./build/release folder is the result. Enjoy. (If it isn't then you need to click Project->Set Active Build Configuration->Release, and re-build and re-run script.sh)\
-\
-
-\b Source code changes required:\
-
-\b0 in luaSocket usocket.h, commented out #include <unistd.h> to compile, because of errors regarding symbol "_strerror$UNIX2003".\
-http://www.haskell.org/pipermail/glasgo ... 08233.html has some info on this. [[removed unistd.h]]\
-\
-in love_opengl.cpp changed struct display_state: int stipple_repeat; int stipple_pattern; to GLints instead [[changed returns to GLint]]\
-\
-SDL_opengl.h\
-define for linux only\
-changed to [[added ifndef]]\
-#ifndef __APPLE__\
-#define GL_GLEXT_VERSION 29\
-#endif}

platform/macosx/info.plist

@@ -30,7 +30,7 @@
 	<key>CFBundleExecutable</key>
 	<string>love</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.LOVE.love</string>
+	<string>org.love2d.love</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

platform/macosx/love-Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

platform/macosx/love.xcodeproj/project.pbxproj

@@ -671,13 +671,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Classes;
-			sourceTree = "<group>";
-		};
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -719,9 +712,7 @@
 			children = (
 				A9255DEA1043188D00BA1496 /* SDLMain.m */,
 				A9255DEB1043188D00BA1496 /* SDLMain.h */,
-				A93E69DC10420ABF007D418B /* src */,
+				A93E69DC10420ABF007D418B /* Source */,
-				080E96DDFE201D6D7F000001 /* Classes */,
-				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
@@ -729,13 +720,6 @@
 			name = love;
 			sourceTree = "<group>";
 		};
-		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -753,7 +737,7 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		A93E69DC10420ABF007D418B /* src */ = {
+		A93E69DC10420ABF007D418B /* Source */ = {
 			isa = PBXGroup;
 			children = (
 				A93E69DD10420ABF007D418B /* common */,
@@ -763,7 +747,7 @@
 				A93E6B9310420ACC007D418B /* resources */,
 				A93E6B9610420ACC007D418B /* scripts */,
 			);
-			name = src;
+			name = Source;
 			path = ../../src;
 			sourceTree = "<group>";
 		};

platform/macosx/loveProj.xcconfig

@@ -0,0 +1,8 @@
+	GCC_ENABLE_CPP_EXCEPTIONS = YES;
+	GCC_ENABLE_CPP_RTTI = YES;
+	GCC_WARN_ABOUT_RETURN_TYPE = YES;
+	GCC_WARN_UNUSED_VARIABLE = YES;
+	GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
+	GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+	PREBINDING = NO;
+	INFOPLIST_EXPAND_BUILD_SETTINGS = YES;

platform/macosx/loveTarget.xcconfig

@@ -0,0 +1,7 @@
+	GCC_PRECOMPILE_PREFIX_HEADER = YES;
+	GCC_PREFIX_HEADER = love_Prefix.pch;
+	INFOPLIST_FILE = Info.plist;
+	INSTALL_PATH = $(HOME)/Applications;
+	PRODUCT_NAME = 	love;
+	STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = Dynamic;
+	GCC_SYMBOLS_PRIVATE_EXTERN = NO;

platform/macosx/modifys

@@ -1,10 +0,0 @@
-in luaSocket usocket.h, commented out #include <unistd.h> to compile, because of errors regarding symbol "_strerror$UNIX2003".
-http://www.haskell.org/pipermail/glasgow-haskell-bugs/2007-May/008233.html has some info on this.
-
-in love_opengl.cpp changed struct display_state: int stipple_repeat; int stipple_pattern; to GLints instead
-
-SDL_opengl.h
-define for linux only
-#ifndef __APPLE__
-#define GL_GLEXT_VERSION 29
-#endif

src/modules/audio/openal/Audio.cpp

@@ -61,6 +61,11 @@ namespace openal
 		alcMakeContextCurrent(0);
 		alcDestroyContext(context);
 		alcCloseDevice(device);
+		
+		printf("waiting on thread to finish...\n");
+		int status;
+		SDL_WaitThread(thread, &status);
+		printf("%d", status);
 	}
 
 	int Audio::run(void * d)