Fixed Xcode projects for the Player

.gitignore

@@ -54,8 +54,15 @@
 Debug
 Release
 /Build
-/Documentation/Doxygen/output/standalone
-Documentation/Doxygen/output/web
+/Documentation/Doxygen/output/standalone/Polycode
+/Documentation/Doxygen/output/standalone/Physics2D
+/Documentation/Doxygen/output/standalone/Physics3D
+/Documentation/Doxygen/output/standalone/Networking
+
+/Documentation/Doxygen/output/web/Polycode
+/Documentation/Doxygen/output/web/Physics2D
+/Documentation/Doxygen/output/web/Physics3D
+/Documentation/Doxygen/output/web/Networking
 
 /Tools/Build/Linux/polybuild*
 /Tools/Build/Linux/polyimport*

Core/Contents/Source/PolyMaterial.cpp

@@ -33,9 +33,12 @@ Material::~Material() {
 	
 	Logger::log("deleting material (%s)\n", name.c_str());
 	
+	// do not delete shaders here, they're shared
+/*	
 	for(int i=0; i < materialShaders.size(); i++)	{
 		delete materialShaders[i];
 	}
+	*/
 	materialShaders.clear();
 
 	for(int i=0; i < shaderBindings.size(); i++)	{

Player/Build/Mac OS X Standalone/StandalonePlayer/StandalonePlayer.xcodeproj/project.pbxproj

@@ -7,31 +7,44 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6D328DD813FDC65800EEF5E2 /* PolycodeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6D328DD713FDC65800EEF5E2 /* PolycodeView.mm */; };
+		6D328DDA13FDC66300EEF5E2 /* PolycodePlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D328DD913FDC66300EEF5E2 /* PolycodePlayer.cpp */; };
+		6D328DDC13FDC67400EEF5E2 /* libPolycore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DDB13FDC67400EEF5E2 /* libPolycore.a */; };
+		6D328DE513FDC68400EEF5E2 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DDD13FDC68400EEF5E2 /* libfreetype.a */; };
+		6D328DE613FDC68400EEF5E2 /* liblibogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DDE13FDC68400EEF5E2 /* liblibogg.a */; };
+		6D328DE713FDC68400EEF5E2 /* liblibvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DDF13FDC68400EEF5E2 /* liblibvorbis.a */; };
+		6D328DE813FDC68400EEF5E2 /* liblibvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DE013FDC68400EEF5E2 /* liblibvorbisfile.a */; };
+		6D328DE913FDC68400EEF5E2 /* liblua5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DE113FDC68400EEF5E2 /* liblua5.1.a */; };
+		6D328DEA13FDC68400EEF5E2 /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DE213FDC68400EEF5E2 /* libphysfs.a */; };
+		6D328DEB13FDC68400EEF5E2 /* libpng15.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DE313FDC68400EEF5E2 /* libpng15.a */; };
+		6D328DEC13FDC68400EEF5E2 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DE413FDC68400EEF5E2 /* libz.a */; };
+		6D328DEE13FDC6DA00EEF5E2 /* libPolycodeLua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D328DED13FDC6DA00EEF5E2 /* libPolycodeLua.a */; };
 		6DE45BB9138DA66C000BDFBA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BB8138DA66C000BDFBA /* Cocoa.framework */; };
 		6DE45BC3138DA66C000BDFBA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6DE45BC1138DA66C000BDFBA /* InfoPlist.strings */; };
 		6DE45BC6138DA66C000BDFBA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DE45BC5138DA66C000BDFBA /* main.m */; };
 		6DE45BCC138DA66C000BDFBA /* StandalonePlayerAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6DE45BCB138DA66C000BDFBA /* StandalonePlayerAppDelegate.mm */; };
 		6DE45BCF138DA66C000BDFBA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6DE45BCD138DA66C000BDFBA /* MainMenu.xib */; };
-		6DE45BDD138DA6A6000BDFBA /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BD5138DA6A6000BDFBA /* liblua.a */; };
 		6DE45BDE138DA6A6000BDFBA /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BD6138DA6A6000BDFBA /* IOKit.framework */; };
-		6DE45BDF138DA6A6000BDFBA /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BD7138DA6A6000BDFBA /* libphysfs.a */; };
-		6DE45BE0138DA6A6000BDFBA /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BD8138DA6A6000BDFBA /* libfreetype.a */; };
-		6DE45BE1138DA6A6000BDFBA /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BD9138DA6A6000BDFBA /* libz.a */; };
-		6DE45BE2138DA6A6000BDFBA /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BDA138DA6A6000BDFBA /* libpng.a */; };
 		6DE45BE3138DA6A6000BDFBA /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BDB138DA6A6000BDFBA /* OpenAL.framework */; };
 		6DE45BE4138DA6A6000BDFBA /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BDC138DA6A6000BDFBA /* OpenGL.framework */; };
-		6DE45BF0138DA6C3000BDFBA /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BED138DA6C3000BDFBA /* libogg.a */; };
-		6DE45BF1138DA6C3000BDFBA /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BEE138DA6C3000BDFBA /* libvorbis.a */; };
-		6DE45BF2138DA6C3000BDFBA /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BEF138DA6C3000BDFBA /* libvorbisfile.a */; };
-		6DE45BF7138DA6F8000BDFBA /* libPolyCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BF4138DA6F8000BDFBA /* libPolyCore.a */; };
-		6DE45BF8138DA6F8000BDFBA /* libPolycodeLUA.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DE45BF5138DA6F8000BDFBA /* libPolycodeLUA.a */; };
-		6DE45BFB138DA707000BDFBA /* PolycodeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6DE45BFA138DA707000BDFBA /* PolycodeView.mm */; };
 		6DE45BFE138DA70E000BDFBA /* PolycodeCocoaPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6DE45BFC138DA70E000BDFBA /* PolycodeCocoaPlayer.mm */; };
-		6DE45C01138DA717000BDFBA /* PolycodePlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6DE45BFF138DA717000BDFBA /* PolycodePlayer.mm */; };
 		6DE45C12138DAE6F000BDFBA /* player_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 6DE45C11138DAE6F000BDFBA /* player_icon.icns */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		6D328DD613FDC65800EEF5E2 /* PolycodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeView.h; path = ../../../../../Release/Darwin/Framework/Core/PolycodeView/PolycodeView.h; sourceTree = "<group>"; };
+		6D328DD713FDC65800EEF5E2 /* PolycodeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PolycodeView.mm; path = ../../../../../Release/Darwin/Framework/Core/PolycodeView/PolycodeView.mm; sourceTree = "<group>"; };
+		6D328DD913FDC66300EEF5E2 /* PolycodePlayer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = PolycodePlayer.cpp; path = ../../../../Contents/Source/PolycodePlayer.cpp; sourceTree = "<group>"; };
+		6D328DDB13FDC67400EEF5E2 /* libPolycore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPolycore.a; path = ../../../../Release/Darwin/Framework/Core/lib/libPolycore.a; sourceTree = "<group>"; };
+		6D328DDD13FDC68400EEF5E2 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/libfreetype.a; sourceTree = "<group>"; };
+		6D328DDE13FDC68400EEF5E2 /* liblibogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibogg.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/liblibogg.a; sourceTree = "<group>"; };
+		6D328DDF13FDC68400EEF5E2 /* liblibvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibvorbis.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/liblibvorbis.a; sourceTree = "<group>"; };
+		6D328DE013FDC68400EEF5E2 /* liblibvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibvorbisfile.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/liblibvorbisfile.a; sourceTree = "<group>"; };
+		6D328DE113FDC68400EEF5E2 /* liblua5.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua5.1.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/liblua5.1.a; sourceTree = "<group>"; };
+		6D328DE213FDC68400EEF5E2 /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/libphysfs.a; sourceTree = "<group>"; };
+		6D328DE313FDC68400EEF5E2 /* libpng15.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng15.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/libpng15.a; sourceTree = "<group>"; };
+		6D328DE413FDC68400EEF5E2 /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libz.a; path = ../../../../Release/Darwin/Framework/Core/Dependencies/lib/libz.a; sourceTree = "<group>"; };
+		6D328DED13FDC6DA00EEF5E2 /* libPolycodeLua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPolycodeLua.a; path = ../../../../Release/Darwin/Framework/Modules/lib/libPolycodeLua.a; sourceTree = "<group>"; };
 		6DE45BB4138DA66C000BDFBA /* StandalonePlayer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StandalonePlayer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6DE45BB8138DA66C000BDFBA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		6DE45BBB138DA66C000BDFBA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -44,24 +57,11 @@
 		6DE45BCA138DA66C000BDFBA /* StandalonePlayerAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StandalonePlayerAppDelegate.h; sourceTree = "<group>"; };
 		6DE45BCB138DA66C000BDFBA /* StandalonePlayerAppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = StandalonePlayerAppDelegate.mm; sourceTree = "<group>"; };
 		6DE45BCE138DA66C000BDFBA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
-		6DE45BD5138DA6A6000BDFBA /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = ../../../../Core/Dependencies/lua/src/liblua.a; sourceTree = "<group>"; };
 		6DE45BD6138DA6A6000BDFBA /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		6DE45BD7138DA6A6000BDFBA /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = ../../../../Core/Dependencies/physfs/Debug/libphysfs.a; sourceTree = "<group>"; };
-		6DE45BD8138DA6A6000BDFBA /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = ../../../../Core/Dependencies/freetype/libfreetype.a; sourceTree = "<group>"; };
-		6DE45BD9138DA6A6000BDFBA /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libz.a; path = ../../../../Core/Dependencies/zlib/libz.a; sourceTree = "<group>"; };
-		6DE45BDA138DA6A6000BDFBA /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = ../../../../Core/Dependencies/libpng/libpng.a; sourceTree = "<group>"; };
 		6DE45BDB138DA6A6000BDFBA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
 		6DE45BDC138DA6A6000BDFBA /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = ../../../../../../../../../System/Library/Frameworks/OpenGL.framework; sourceTree = "<group>"; };
-		6DE45BED138DA6C3000BDFBA /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../../../Release/Mac OS X/Framework/Dependencies/Lib/libogg.a"; sourceTree = "<group>"; };
-		6DE45BEE138DA6C3000BDFBA /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../../../Release/Mac OS X/Framework/Dependencies/Lib/libvorbis.a"; sourceTree = "<group>"; };
-		6DE45BEF138DA6C3000BDFBA /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "../../../../Release/Mac OS X/Framework/Dependencies/Lib/libvorbisfile.a"; sourceTree = "<group>"; };
-		6DE45BF4138DA6F8000BDFBA /* libPolyCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPolyCore.a; path = "../../../../../../../Library/Developer/Xcode/DerivedData/PolyCore-ecbhldydhvplehavgvhjdlapyvwd/Build/Products/Debug/libPolyCore.a"; sourceTree = "<group>"; };
-		6DE45BF5138DA6F8000BDFBA /* libPolycodeLUA.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPolycodeLUA.a; path = "../../../../../../../Library/Developer/Xcode/DerivedData/Bindings-bojbiqnjfgqgjpgcdihwtncgpnvk/Build/Products/Debug/libPolycodeLUA.a"; sourceTree = "<group>"; };
-		6DE45BF9138DA707000BDFBA /* PolycodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeView.h; path = "../../../../../Release/Mac OS X/Framework/Core/PolycodeView/PolycodeView.h"; sourceTree = "<group>"; };
-		6DE45BFA138DA707000BDFBA /* PolycodeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PolycodeView.mm; path = "../../../../../Release/Mac OS X/Framework/Core/PolycodeView/PolycodeView.mm"; sourceTree = "<group>"; };
 		6DE45BFC138DA70E000BDFBA /* PolycodeCocoaPlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PolycodeCocoaPlayer.mm; path = ../../../../Contents/Source/PolycodeCocoaPlayer.mm; sourceTree = "<group>"; };
 		6DE45BFD138DA70E000BDFBA /* PolycodeCocoaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeCocoaPlayer.h; path = ../../../../Contents/Include/PolycodeCocoaPlayer.h; sourceTree = "<group>"; };
-		6DE45BFF138DA717000BDFBA /* PolycodePlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PolycodePlayer.mm; path = ../../../../Contents/Source/PolycodePlayer.mm; sourceTree = "<group>"; };
 		6DE45C00138DA717000BDFBA /* PolycodePlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodePlayer.h; path = ../../../../Contents/Include/PolycodePlayer.h; sourceTree = "<group>"; };
 		6DE45C11138DAE6F000BDFBA /* player_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = player_icon.icns; path = ../../../../../Assets/Icons/player_icon.icns; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -72,19 +72,19 @@
 			buildActionMask = 2147483647;
 			files = (
 				6DE45BB9138DA66C000BDFBA /* Cocoa.framework in Frameworks */,
-				6DE45BDD138DA6A6000BDFBA /* liblua.a in Frameworks */,
 				6DE45BDE138DA6A6000BDFBA /* IOKit.framework in Frameworks */,
-				6DE45BDF138DA6A6000BDFBA /* libphysfs.a in Frameworks */,
-				6DE45BE0138DA6A6000BDFBA /* libfreetype.a in Frameworks */,
-				6DE45BE1138DA6A6000BDFBA /* libz.a in Frameworks */,
-				6DE45BE2138DA6A6000BDFBA /* libpng.a in Frameworks */,
 				6DE45BE3138DA6A6000BDFBA /* OpenAL.framework in Frameworks */,
 				6DE45BE4138DA6A6000BDFBA /* OpenGL.framework in Frameworks */,
-				6DE45BF0138DA6C3000BDFBA /* libogg.a in Frameworks */,
-				6DE45BF1138DA6C3000BDFBA /* libvorbis.a in Frameworks */,
-				6DE45BF2138DA6C3000BDFBA /* libvorbisfile.a in Frameworks */,
-				6DE45BF7138DA6F8000BDFBA /* libPolyCore.a in Frameworks */,
-				6DE45BF8138DA6F8000BDFBA /* libPolycodeLUA.a in Frameworks */,
+				6D328DDC13FDC67400EEF5E2 /* libPolycore.a in Frameworks */,
+				6D328DE513FDC68400EEF5E2 /* libfreetype.a in Frameworks */,
+				6D328DE613FDC68400EEF5E2 /* liblibogg.a in Frameworks */,
+				6D328DE713FDC68400EEF5E2 /* liblibvorbis.a in Frameworks */,
+				6D328DE813FDC68400EEF5E2 /* liblibvorbisfile.a in Frameworks */,
+				6D328DE913FDC68400EEF5E2 /* liblua5.1.a in Frameworks */,
+				6D328DEA13FDC68400EEF5E2 /* libphysfs.a in Frameworks */,
+				6D328DEB13FDC68400EEF5E2 /* libpng15.a in Frameworks */,
+				6D328DEC13FDC68400EEF5E2 /* libz.a in Frameworks */,
+				6D328DEE13FDC6DA00EEF5E2 /* libPolycodeLua.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -111,17 +111,17 @@
 		6DE45BB7138DA66C000BDFBA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				6DE45BF4138DA6F8000BDFBA /* libPolyCore.a */,
-				6DE45BF5138DA6F8000BDFBA /* libPolycodeLUA.a */,
-				6DE45BED138DA6C3000BDFBA /* libogg.a */,
-				6DE45BEE138DA6C3000BDFBA /* libvorbis.a */,
-				6DE45BEF138DA6C3000BDFBA /* libvorbisfile.a */,
-				6DE45BD5138DA6A6000BDFBA /* liblua.a */,
+				6D328DED13FDC6DA00EEF5E2 /* libPolycodeLua.a */,
+				6D328DDD13FDC68400EEF5E2 /* libfreetype.a */,
+				6D328DDE13FDC68400EEF5E2 /* liblibogg.a */,
+				6D328DDF13FDC68400EEF5E2 /* liblibvorbis.a */,
+				6D328DE013FDC68400EEF5E2 /* liblibvorbisfile.a */,
+				6D328DE113FDC68400EEF5E2 /* liblua5.1.a */,
+				6D328DE213FDC68400EEF5E2 /* libphysfs.a */,
+				6D328DE313FDC68400EEF5E2 /* libpng15.a */,
+				6D328DE413FDC68400EEF5E2 /* libz.a */,
+				6D328DDB13FDC67400EEF5E2 /* libPolycore.a */,
 				6DE45BD6138DA6A6000BDFBA /* IOKit.framework */,
-				6DE45BD7138DA6A6000BDFBA /* libphysfs.a */,
-				6DE45BD8138DA6A6000BDFBA /* libfreetype.a */,
-				6DE45BD9138DA6A6000BDFBA /* libz.a */,
-				6DE45BDA138DA6A6000BDFBA /* libpng.a */,
 				6DE45BDB138DA6A6000BDFBA /* OpenAL.framework */,
 				6DE45BDC138DA6A6000BDFBA /* OpenGL.framework */,
 				6DE45BB8138DA66C000BDFBA /* Cocoa.framework */,
@@ -143,13 +143,13 @@
 		6DE45BBE138DA66C000BDFBA /* StandalonePlayer */ = {
 			isa = PBXGroup;
 			children = (
+				6D328DD913FDC66300EEF5E2 /* PolycodePlayer.cpp */,
+				6D328DD613FDC65800EEF5E2 /* PolycodeView.h */,
+				6D328DD713FDC65800EEF5E2 /* PolycodeView.mm */,
 				6DE45C11138DAE6F000BDFBA /* player_icon.icns */,
-				6DE45BFF138DA717000BDFBA /* PolycodePlayer.mm */,
 				6DE45C00138DA717000BDFBA /* PolycodePlayer.h */,
 				6DE45BFC138DA70E000BDFBA /* PolycodeCocoaPlayer.mm */,
 				6DE45BFD138DA70E000BDFBA /* PolycodeCocoaPlayer.h */,
-				6DE45BF9138DA707000BDFBA /* PolycodeView.h */,
-				6DE45BFA138DA707000BDFBA /* PolycodeView.mm */,
 				6DE45BCA138DA66C000BDFBA /* StandalonePlayerAppDelegate.h */,
 				6DE45BCB138DA66C000BDFBA /* StandalonePlayerAppDelegate.mm */,
 				6DE45BCD138DA66C000BDFBA /* MainMenu.xib */,
@@ -251,9 +251,9 @@
 			files = (
 				6DE45BC6138DA66C000BDFBA /* main.m in Sources */,
 				6DE45BCC138DA66C000BDFBA /* StandalonePlayerAppDelegate.mm in Sources */,
-				6DE45BFB138DA707000BDFBA /* PolycodeView.mm in Sources */,
 				6DE45BFE138DA70E000BDFBA /* PolycodeCocoaPlayer.mm in Sources */,
-				6DE45C01138DA717000BDFBA /* PolycodePlayer.mm in Sources */,
+				6D328DD813FDC65800EEF5E2 /* PolycodeView.mm in Sources */,
+				6D328DDA13FDC66300EEF5E2 /* PolycodePlayer.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -321,25 +321,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "StandalonePlayer/StandalonePlayer-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Core/Include\"",
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Dependencies/Include\"",
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Modules/Include\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/include\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/Dependencies/include\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/Dependencies/include/lua5.1\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Modules/include\"",
 					/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/OpenAL.framework/Headers,
-					"\"$(SRCROOT)/../../../../Core/Dependencies/lua/src\"",
-					"\"$(SRCROOT)/../../../../Bindings/Contents/LUA/Include\"",
 				);
 				INFOPLIST_FILE = "StandalonePlayer/StandalonePlayer-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/lua/src\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/physfs/Debug\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/freetype\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/zlib\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/libpng\"",
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Dependencies/Lib\"",
-					"\"$(SRCROOT)/../../../../../../../Library/Developer/Xcode/DerivedData/Modules-epduxiffqrcazabvaazmexadjpgk/Build/Products/Debug\"",
-					"\"$(SRCROOT)/../../../../../../../Library/Developer/Xcode/DerivedData/PolyCore-ecbhldydhvplehavgvhjdlapyvwd/Build/Products/Debug\"",
-					"\"$(SRCROOT)/../../../../../../../Library/Developer/Xcode/DerivedData/Bindings-bojbiqnjfgqgjpgcdihwtncgpnvk/Build/Products/Debug\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/lib\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/Dependencies/lib\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Modules/lib\"",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -356,25 +349,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "StandalonePlayer/StandalonePlayer-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Core/Include\"",
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Dependencies/Include\"",
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Modules/Include\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/include\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/Dependencies/include\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/Dependencies/include/lua5.1\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Modules/include\"",
 					/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/OpenAL.framework/Headers,
-					"\"$(SRCROOT)/../../../../Core/Dependencies/lua/src\"",
-					"\"$(SRCROOT)/../../../../Bindings/Contents/LUA/Include\"",
 				);
 				INFOPLIST_FILE = "StandalonePlayer/StandalonePlayer-Info.plist";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/lua/src\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/physfs/Debug\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/freetype\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/zlib\"",
-					"\"$(SRCROOT)/../../../../Core/Dependencies/libpng\"",
-					"\"$(SRCROOT)/../../../../Release/Mac OS X/Framework/Dependencies/Lib\"",
-					"\"$(SRCROOT)/../../../../../../../Library/Developer/Xcode/DerivedData/Modules-epduxiffqrcazabvaazmexadjpgk/Build/Products/Debug\"",
-					"\"$(SRCROOT)/../../../../../../../Library/Developer/Xcode/DerivedData/PolyCore-ecbhldydhvplehavgvhjdlapyvwd/Build/Products/Debug\"",
-					"\"$(SRCROOT)/../../../../../../../Library/Developer/Xcode/DerivedData/Bindings-bojbiqnjfgqgjpgcdihwtncgpnvk/Build/Products/Debug\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/lib\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Core/Dependencies/lib\"",
+					"\"$(SRCROOT)/../../../../Release/Darwin/Framework/Modules/lib\"",
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Player/Build/Mac OS X Standalone/StandalonePlayer/StandalonePlayer/en.lproj/MainMenu.xib

@@ -147,7 +147,7 @@
 				<string key="NSName">_NSMainMenu</string>
 			</object>
 			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowStyleMask">7</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
 				<int key="NSWTFlags">1954021376</int>
@@ -165,7 +165,7 @@
 							<object class="NSPSMatrix" key="NSDrawMatrix"/>
 							<string key="NSFrameSize">{480, 360}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSNextKeyView"/>
+							<reference key="NSWindow"/>
 							<object class="NSOpenGLPixelFormat" key="NSPixelFormat">
 								<object class="NSMutableData" key="NSPixelAttributes">
 									<bytes key="NS.bytes">AAAAYAAAAAA</bytes>
@@ -175,6 +175,7 @@
 					</object>
 					<string key="NSFrame">{{7, 11}, {480, 360}}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="634251339"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>

Player/Build/Mac OS X/Polycode Player.xcodeproj/project.pbxproj

@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		1DDD582C0DA1D0D100B32029 /* MyDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* MyDocument.xib */; };
 		1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; };
+		6D1D88D613FDA926004918FC /* libPolycore_d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D1D88D513FDA926004918FC /* libPolycore_d.a */; };
+		6D1D88DE13FDA9B0004918FC /* PolycodePlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D1D88DD13FDA9B0004918FC /* PolycodePlayer.cpp */; };
 		6D34117B12B7D6ED0034FA9B /* PPlayerDocumentController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6D34117A12B7D6ED0034FA9B /* PPlayerDocumentController.m */; };
 		6D34134112B7FCD00034FA9B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D34134012B7FCD00034FA9B /* IOKit.framework */; };
 		6D96F92E13FD968F00A26C09 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D96F92613FD968F00A26C09 /* libfreetype.a */; };
@@ -19,13 +21,11 @@
 		6D96F93313FD968F00A26C09 /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D96F92B13FD968F00A26C09 /* libphysfs.a */; };
 		6D96F93413FD968F00A26C09 /* libpng15.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D96F92C13FD968F00A26C09 /* libpng15.a */; };
 		6D96F93513FD968F00A26C09 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D96F92D13FD968F00A26C09 /* libz.a */; };
-		6D96F93713FD969D00A26C09 /* libPolycore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D96F93613FD969D00A26C09 /* libPolycore.a */; };
 		6D96F93A13FD96B600A26C09 /* PolycodeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6D96F93913FD96B600A26C09 /* PolycodeView.mm */; };
 		6D96F93C13FD974200A26C09 /* libPolycodeLua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D96F93B13FD974200A26C09 /* libPolycodeLua.a */; };
 		6DBAB08212B6EAAD00986D01 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DBAB07B12B6EAAD00986D01 /* OpenAL.framework */; };
 		6DBAB08312B6EAAD00986D01 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DBAB07C12B6EAAD00986D01 /* OpenGL.framework */; };
 		6DBAB0BF12B6ECCB00986D01 /* PolycodeCocoaPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6DBAB0BE12B6ECCB00986D01 /* PolycodeCocoaPlayer.mm */; };
-		6DBAB0C412B6EE4400986D01 /* PolycodePlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6DBAB0C312B6EE4400986D01 /* PolycodePlayer.mm */; };
 		6DD40EF0137361AE00D602D3 /* app_file_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 6DD40EEE137361AE00D602D3 /* app_file_icon.icns */; };
 		6DD40EF1137361AE00D602D3 /* player_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 6DD40EEF137361AE00D602D3 /* player_icon.icns */; };
 		8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; };
@@ -48,6 +48,8 @@
 		2A37F4BAFDCFA73011CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
 		2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		6D1D88D513FDA926004918FC /* libPolycore_d.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPolycore_d.a; path = ../../../Release/Darwin/Framework/Core/lib/libPolycore_d.a; sourceTree = "<group>"; };
+		6D1D88DD13FDA9B0004918FC /* PolycodePlayer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = PolycodePlayer.cpp; path = ../../Contents/Source/PolycodePlayer.cpp; sourceTree = "<group>"; };
 		6D34117912B7D6ED0034FA9B /* PPlayerDocumentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPlayerDocumentController.h; sourceTree = "<group>"; };
 		6D34117A12B7D6ED0034FA9B /* PPlayerDocumentController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPlayerDocumentController.m; sourceTree = "<group>"; };
 		6D34134012B7FCD00034FA9B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
@@ -59,7 +61,6 @@
 		6D96F92B13FD968F00A26C09 /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = ../../../Release/Darwin/Framework/Core/Dependencies/lib/libphysfs.a; sourceTree = "<group>"; };
 		6D96F92C13FD968F00A26C09 /* libpng15.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng15.a; path = ../../../Release/Darwin/Framework/Core/Dependencies/lib/libpng15.a; sourceTree = "<group>"; };
 		6D96F92D13FD968F00A26C09 /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libz.a; path = ../../../Release/Darwin/Framework/Core/Dependencies/lib/libz.a; sourceTree = "<group>"; };
-		6D96F93613FD969D00A26C09 /* libPolycore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPolycore.a; path = ../../../Release/Darwin/Framework/Core/lib/libPolycore.a; sourceTree = "<group>"; };
 		6D96F93813FD96B600A26C09 /* PolycodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeView.h; path = ../../../Release/Darwin/Framework/Core/PolycodeView/PolycodeView.h; sourceTree = "<group>"; };
 		6D96F93913FD96B600A26C09 /* PolycodeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PolycodeView.mm; path = ../../../Release/Darwin/Framework/Core/PolycodeView/PolycodeView.mm; sourceTree = "<group>"; };
 		6D96F93B13FD974200A26C09 /* libPolycodeLua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPolycodeLua.a; path = ../../../Release/Darwin/Framework/Modules/lib/libPolycodeLua.a; sourceTree = "<group>"; };
@@ -68,7 +69,6 @@
 		6DBAB0BD12B6ECC400986D01 /* PolycodeCocoaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodeCocoaPlayer.h; path = ../../Contents/Include/PolycodeCocoaPlayer.h; sourceTree = SOURCE_ROOT; };
 		6DBAB0BE12B6ECCB00986D01 /* PolycodeCocoaPlayer.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = PolycodeCocoaPlayer.mm; path = ../../Contents/Source/PolycodeCocoaPlayer.mm; sourceTree = SOURCE_ROOT; };
 		6DBAB0C212B6EE2200986D01 /* PolycodePlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PolycodePlayer.h; path = ../../Contents/Include/PolycodePlayer.h; sourceTree = SOURCE_ROOT; };
-		6DBAB0C312B6EE4400986D01 /* PolycodePlayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PolycodePlayer.mm; path = ../../Contents/Source/PolycodePlayer.mm; sourceTree = SOURCE_ROOT; };
 		6DD40EEE137361AE00D602D3 /* app_file_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = app_file_icon.icns; path = ../../../Assets/Icons/app_file_icon.icns; sourceTree = "<group>"; };
 		6DD40EEF137361AE00D602D3 /* player_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = player_icon.icns; path = ../../../Assets/Icons/player_icon.icns; sourceTree = "<group>"; };
 		6DD40EFC137368B100D602D3 /* class.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = class.lua; sourceTree = "<group>"; };
@@ -183,8 +183,8 @@
 				6D96F93313FD968F00A26C09 /* libphysfs.a in Frameworks */,
 				6D96F93413FD968F00A26C09 /* libpng15.a in Frameworks */,
 				6D96F93513FD968F00A26C09 /* libz.a in Frameworks */,
-				6D96F93713FD969D00A26C09 /* libPolycore.a in Frameworks */,
 				6D96F93C13FD974200A26C09 /* libPolycodeLua.a in Frameworks */,
+				6D1D88D613FDA926004918FC /* libPolycore_d.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -236,9 +236,9 @@
 		2A37F4ABFDCFA73011CA2CEA /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				6D1D88DD13FDA9B0004918FC /* PolycodePlayer.cpp */,
 				6D96F93813FD96B600A26C09 /* PolycodeView.h */,
 				6D96F93913FD96B600A26C09 /* PolycodeView.mm */,
-				6DBAB0C312B6EE4400986D01 /* PolycodePlayer.mm */,
 				6DBAB0C212B6EE2200986D01 /* PolycodePlayer.h */,
 				6DBAB0BE12B6ECCB00986D01 /* PolycodeCocoaPlayer.mm */,
 				6DBAB0BD12B6ECC400986D01 /* PolycodeCocoaPlayer.h */,
@@ -276,8 +276,8 @@
 		2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				6D1D88D513FDA926004918FC /* libPolycore_d.a */,
 				6D96F93B13FD974200A26C09 /* libPolycodeLua.a */,
-				6D96F93613FD969D00A26C09 /* libPolycore.a */,
 				6D96F92613FD968F00A26C09 /* libfreetype.a */,
 				6D96F92713FD968F00A26C09 /* liblibogg.a */,
 				6D96F92813FD968F00A26C09 /* liblibvorbis.a */,
@@ -510,9 +510,9 @@
 				8D15AC310486D014006FF6A4 /* MyDocument.m in Sources */,
 				8D15AC320486D014006FF6A4 /* main.m in Sources */,
 				6DBAB0BF12B6ECCB00986D01 /* PolycodeCocoaPlayer.mm in Sources */,
-				6DBAB0C412B6EE4400986D01 /* PolycodePlayer.mm in Sources */,
 				6D34117B12B7D6ED0034FA9B /* PPlayerDocumentController.m in Sources */,
 				6D96F93A13FD96B600A26C09 /* PolycodeView.mm in Sources */,
+				6D1D88DE13FDA9B0004918FC /* PolycodePlayer.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};