Xcode Repair

Fixed a few more issues with Xcode. Still a few more things to do.

engine/compilers/Xcode/Torque2D.xcodeproj/xcshareddata/xcschemes/Torque2D.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "869FF8B71651518C002FE082"
+               BuildableName = "Torque2D.app"
+               BlueprintName = "Torque2D"
+               ReferencedContainer = "container:Torque2D.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "869FF8B71651518C002FE082"
+            BuildableName = "Torque2D.app"
+            BlueprintName = "Torque2D"
+            ReferencedContainer = "container:Torque2D.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "869FF8B71651518C002FE082"
+            BuildableName = "Torque2D.app"
+            BlueprintName = "Torque2D"
+            ReferencedContainer = "container:Torque2D.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

engine/source/console/codeBlock.cc

@@ -460,10 +460,10 @@ bool CodeBlock::read(StringTableEntry fileName, Stream &st)
       {
          U32 ip;
          st.read(&ip);
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
          *(U64*)(code+ip) = (U64)ste;
 #else
-         code[ip] = (U32)(size_t)ste;
+         code[ip] = (U32)ste;
 #endif
       }
    }

engine/source/console/compiledEval.cc

@@ -1434,10 +1434,10 @@ breakContinue:
             }
             // Now, rewrite our code a bit (ie, avoid future lookups) and fall
             // through to OP_CALLFUNC
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
             *((U64*)(code+ip+2)) = ((U64)nsEntry);
 #else
-            code[ip+2] = ((U32)(size_t)nsEntry);
+            code[ip+2] = ((U32)nsEntry);
 #endif
             code[ip-1] = OP_CALLFUNC;
 
@@ -1465,7 +1465,7 @@ breakContinue:
 
             if(callType == FuncCallExprNode::FunctionCall) 
             {
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
                nsEntry = ((Namespace::Entry *) *((U64*)(code+ip-3)));
 #else
                nsEntry = ((Namespace::Entry *) *(code+ip-3));

engine/source/console/compiler.cc

@@ -74,10 +74,10 @@ namespace Compiler
    
    void evalSTEtoCode(StringTableEntry ste, U32 ip, U32 *codeStream)
    {
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
       *((U64*)(codeStream+ip)) = (U64)ste;
 #else
-      codeStream[ip] = (U32)(size_t)ste;
+      codeStream[ip] = (U32)ste;
 #endif
    }
    

engine/source/console/compiler.h

@@ -214,7 +214,7 @@ namespace Compiler
    
    inline StringTableEntry CodeToSTE(U32 *code, U32 ip)
    {
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
       return (StringTableEntry)(*((U64*)(code+ip)));
 #else
       return (StringTableEntry)(*(code+ip));

engine/source/platformOSX/osxOpenGLDevice.mm

@@ -416,7 +416,7 @@ bool osxOpenGLDevice::getVerticalSync()
 
     //Note that this returns the number of frames between Swaps.
     //The function returns 0 / false if SwapInterval has not been specified.
-    return getVerticalSync();
+    return false;//getVerticalSync();
 }
 
 //-----------------------------------------------------------------------------