Merge pull request #25 from marauder2k7/development

more 64bit defines

engine/source/2d/core/SpriteBatchItem.h

@@ -156,7 +156,7 @@ public:
         // This should be as unique as possible as it is used for hashing.
         operator const U32() const
         {
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
             return (U32)((U64)(mArgString) * (U32)2654435761);
 #else
             return (U32)(mArgString) * (U32)2654435761;

engine/source/collection/hashTable.h

@@ -41,7 +41,7 @@ namespace Hash
 
    inline U32 hash(const void *data)
    {
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
       return (U32)((U64)data);
 #else
       return (U32)data;

engine/source/platform/threads/thread.h

@@ -33,7 +33,7 @@ struct PlatformThreadData;
 // Typedefs
 typedef void (*ThreadRunFunction)(void *data);
 
-#ifdef TORQUE_64
+#ifdef TORQUE_CPU_X64
 typedef U64 ThreadIdent;
 #else
 typedef U32 ThreadIdent;

engine/source/platform/types.gcc.h

@@ -52,7 +52,6 @@ typedef unsigned long long  U64;
 #  define TORQUE_COMPILER_STRING "GCC "
 #endif
 
-
 //--------------------------------------
 // Identify the Operating System
 #if defined(_WIN64)
@@ -130,7 +129,7 @@ typedef unsigned long long  U64;
 #  define TORQUE_CPU_STRING "Intel x86-64"
 #  define TORQUE_CPU_X86_64
 #  define TORQUE_LITTLE_ENDIAN
-#  define TORQUE_64
+#  define TORQUE_CPU_X64
 
 #elif defined(__ppc__)
 #  define TORQUE_CPU_STRING "PowerPC"
@@ -146,7 +145,7 @@ typedef unsigned long long  U64;
 #  define TORQUE_CPU_STRING "ARM"
 #  define TORQUE_CPU_ARM
 #  define TORQUE_LITTLE_ENDIAN
-#  define TORQUE_64
+#  define TORQUE_CPU_X64
 
 #elif defined(EMSCRIPTEN)
 

engine/source/platform/types.h

@@ -89,6 +89,14 @@ static const F32 F32_MAX = F32(3.402823466e+38F);                 ///< Constant
 #  error "Unknown Compiler"
 #endif
 
+/// Integral type matching the host's memory address width.
+#ifdef TORQUE_CPU_X64
+typedef U64 MEM_ADDRESS;
+#else
+typedef U32 MEM_ADDRESS;
+#endif
+
+
 //--------------------------------------
 // Enable Asserts in all debug builds -- AFTER compiler types include.
 #if defined(TORQUE_DEBUG)

engine/source/platform/types.visualc.h

@@ -85,7 +85,7 @@ typedef unsigned _int64 U64;
 
 #if defined(_M_AMD64)
 #  define TORQUE_CPU_STRING "x86_64"
-#  define TORQUE_64
+#  define TORQUE_CPU_X64
 #  define TORQUE_LITTLE_ENDIAN
 //#  define TORQUE_SUPPORTS_NASM
 //#  define TORQUE_SUPPORTS_VC_INLINE_X86_ASM

toybox/Sandbox/1/gui/guiProfiles.cs

@@ -72,24 +72,6 @@ function SetColorAlpha(%color, %newAlpha)
 
 //-----------------------------------------------------------------------------
 
-if(!isObject(GuiDefaultProfile)) new GuiControlProfile (GuiDefaultProfile)
-{
-    // fill color
-    fillColor = "0 0 0 0";
-
-    // font
-    fontType = $platformFontType;
-    fontSize = $platformFontSize;
-    fontColor = "255 255 255 255";
-	align = center;
-	vAlign = middle;
-
-	cursorColor = "0 0 0 255";
-
-	borderDefault = GuiDefaultBorderProfile;
-	category = "default";
-};
-
 new GuiCursor(DefaultCursor)
 {
     hotSpot = "3 3";
@@ -158,6 +140,24 @@ if (!isObject(GuiDefaultBorderProfile)) new GuiBorderProfile (GuiDefaultBorderPr
 	underfill = true;
 };
 
+if(!isObject(GuiDefaultProfile)) new GuiControlProfile (GuiDefaultProfile)
+{
+    // fill color
+    fillColor = "0 0 0 0";
+
+    // font
+    fontType = $platformFontType;
+    fontSize = $platformFontSize;
+    fontColor = "255 255 255 255";
+	align = center;
+	vAlign = middle;
+
+	cursorColor = "0 0 0 255";
+
+	borderDefault = GuiDefaultBorderProfile;
+	category = "default";
+};
+
 if (!isObject(GuiBrightBorderProfile)) new GuiBorderProfile (GuiBrightBorderProfile : GuiDefaultBorderProfile)
 {
 	border = 2;