Updated to XCode 5.0 and MacOS X Maverick.

fabiensanglard · Oct 31, 2013 · b547a7d · b547a7d
1 parent d3ac7bb
commit b547a7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/engine/macosx/macosx.xcodeproj/project.pbxproj b/engine/macosx/macosx.xcodeproj/project.pbxproj
@@ -569,7 +569,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -597,7 +597,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -620,7 +620,7 @@
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "macosx/macosx-Prefix.pch";
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				INFOPLIST_FILE = "macosx/macosx-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -633,7 +633,7 @@
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "macosx/macosx-Prefix.pch";
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				INFOPLIST_FILE = "macosx/macosx-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;

diff --git a/engine/src/dEngine.c b/engine/src/dEngine.c
@@ -74,14 +74,16 @@ void dEngine_ReadConfig(void)
 
 
 	config = FS_OpenFile(CONFIG_PATH, "rt");
-	FS_UploadToRAM(config);
-
-	if (!config)
-	{
+
+    if (!config){
 		Log_Printf("Configuration file: data/config.cfg not found");
 		exit(0);
 	}
+
+
+	FS_UploadToRAM(config);
 
+
 	//renderer.resolution = 1;
 
 	LE_pushLexer();