From b1c52f8bb1247da0b9e60dca932d88032a1e100d Mon Sep 17 00:00:00 2001 From: Thomas Fischer Date: Sat, 15 Mar 2014 13:23:49 +0100 Subject: [PATCH 1/4] Added identify the CPU x64. --- Engine/source/platform/types.visualc.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Engine/source/platform/types.visualc.h b/Engine/source/platform/types.visualc.h index 4379e8a57..5fbdaf64f 100644 --- a/Engine/source/platform/types.visualc.h +++ b/Engine/source/platform/types.visualc.h @@ -70,7 +70,11 @@ typedef unsigned _int64 U64; //-------------------------------------- // Identify the CPU -#if defined(_M_IX86) +#if defined(_M_X64) +# define TORQUE_CPU_STRING "x64" +# define TORQUE_CPU_X64 +# define TORQUE_LITTLE_ENDIAN +#elif defined(_M_IX86) # define TORQUE_CPU_STRING "x86" # define TORQUE_CPU_X86 # define TORQUE_LITTLE_ENDIAN From e37ecb056729945b9db127ed24747c911c045670 Mon Sep 17 00:00:00 2001 From: Thomas Fischer Date: Sat, 15 Mar 2014 13:43:48 +0100 Subject: [PATCH 2/4] fixed WIN64 precompiler flags up - basics --- Engine/source/platform/types.codewarrior.h | 4 ++++ Engine/source/platform/types.gcc.h | 4 ++++ Engine/source/platform/types.visualc.h | 12 ++++++++---- Engine/source/platform/types.win32.h | 7 ++++++- Engine/source/platform/typesWin32.h | 5 +++++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Engine/source/platform/types.codewarrior.h b/Engine/source/platform/types.codewarrior.h index 64912784d..38d9d1d49 100644 --- a/Engine/source/platform/types.codewarrior.h +++ b/Engine/source/platform/types.codewarrior.h @@ -51,6 +51,10 @@ typedef unsigned long long U64; ///< Compiler independent Unsigned 64-bit in //-------------------------------------- // Identify the Operating System +#if defined(_WIN64) +# define TORQUE_OS_STRING "Win64" +# define TORQUE_OS_WIN64 +# include "platform/types.win32.h" #if defined(_WIN32) # define TORQUE_OS_STRING "Win32" # define TORQUE_OS_WIN32 diff --git a/Engine/source/platform/types.gcc.h b/Engine/source/platform/types.gcc.h index 406b07ef1..e7f0f6953 100644 --- a/Engine/source/platform/types.gcc.h +++ b/Engine/source/platform/types.gcc.h @@ -55,6 +55,10 @@ typedef unsigned long long U64; //-------------------------------------- // Identify the Operating System +#if defined(_WIN64) +# define TORQUE_OS_STRING "Win64" +# define TORQUE_OS_WIN64 +# include "platform/types.win32.h" #if defined(__WIN32__) || defined(_WIN32) # define TORQUE_OS_STRING "Win32" # define TORQUE_OS_WIN32 diff --git a/Engine/source/platform/types.visualc.h b/Engine/source/platform/types.visualc.h index 5fbdaf64f..1ae8d5113 100644 --- a/Engine/source/platform/types.visualc.h +++ b/Engine/source/platform/types.visualc.h @@ -59,10 +59,14 @@ typedef unsigned _int64 U64; # define TORQUE_OS_STRING "Xbox" # define TORQUE_OS_XBOX # include "platform/types.win32.h" -#elif defined(_WIN32) +#elif defined( _WIN32 ) # define TORQUE_OS_STRING "Win32" # define TORQUE_OS_WIN32 # include "platform/types.win32.h" +#elif defined( _WIN64 ) +# define TORQUE_OS_STRING "Win64" +# define TORQUE_OS_WIN64 +# include "platform/types.win32.h" #else # error "VC: Unsupported Operating System" #endif @@ -70,17 +74,17 @@ typedef unsigned _int64 U64; //-------------------------------------- // Identify the CPU -#if defined(_M_X64) +#if defined( _M_X64 ) # define TORQUE_CPU_STRING "x64" # define TORQUE_CPU_X64 # define TORQUE_LITTLE_ENDIAN -#elif defined(_M_IX86) +#elif defined( _M_IX86 ) # define TORQUE_CPU_STRING "x86" # define TORQUE_CPU_X86 # define TORQUE_LITTLE_ENDIAN # define TORQUE_SUPPORTS_NASM # define TORQUE_SUPPORTS_VC_INLINE_X86_ASM -#elif defined(TORQUE_OS_XENON) +#elif defined( TORQUE_OS_XENON ) # define TORQUE_CPU_STRING "ppc" # define TORQUE_CPU_PPC # define TORQUE_BIG_ENDIAN diff --git a/Engine/source/platform/types.win32.h b/Engine/source/platform/types.win32.h index d95d3cec5..68e0e3a63 100644 --- a/Engine/source/platform/types.win32.h +++ b/Engine/source/platform/types.win32.h @@ -29,7 +29,12 @@ // size_t is needed to overload new // size_t tends to be OS and compiler specific and may need to // be if/def'ed in the future -typedef unsigned int dsize_t; + +#ifdef _WIN64 +typedef unsigned long long dsize_t; +#else +typedef unsigned int dsize_t; +#endif // _WIN64 /// Platform dependent file date-time structure. The definition of this structure diff --git a/Engine/source/platform/typesWin32.h b/Engine/source/platform/typesWin32.h index c4b2aa2b2..029b1a341 100644 --- a/Engine/source/platform/typesWin32.h +++ b/Engine/source/platform/typesWin32.h @@ -76,7 +76,12 @@ typedef double F64; ///< Compiler independent 64-bit float // size_t is needed to overload new // size_t tends to be OS and compiler specific and may need to // be if/def'ed in the future + +#ifdef _WIN64 +typedef unsigned long long dsize_t; +#else typedef unsigned int dsize_t; +#endif // _WIN64 typedef const char* StringTableEntry; From 47a2cc165a1052aad5c007c236373cbf50d87263 Mon Sep 17 00:00:00 2001 From: Thomas Fischer Date: Sat, 15 Mar 2014 14:05:30 +0100 Subject: [PATCH 3/4] moved header file to have a more meaningful naming --- Engine/source/platform/types.codewarrior.h | 4 ++-- Engine/source/platform/types.gcc.h | 4 ++-- Engine/source/platform/types.visualc.h | 4 ++-- Engine/source/platform/{types.win32.h => types.win.h} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename Engine/source/platform/{types.win32.h => types.win.h} (100%) diff --git a/Engine/source/platform/types.codewarrior.h b/Engine/source/platform/types.codewarrior.h index 38d9d1d49..f01f312ae 100644 --- a/Engine/source/platform/types.codewarrior.h +++ b/Engine/source/platform/types.codewarrior.h @@ -54,11 +54,11 @@ typedef unsigned long long U64; ///< Compiler independent Unsigned 64-bit in #if defined(_WIN64) # define TORQUE_OS_STRING "Win64" # define TORQUE_OS_WIN64 -# include "platform/types.win32.h" +# include "platform/types.win.h" #if defined(_WIN32) # define TORQUE_OS_STRING "Win32" # define TORQUE_OS_WIN32 -# include "platform/types.win32.h" +# include "platform/types.win.h" #elif defined(macintosh) || defined(__APPLE__) # define TORQUE_OS_STRING "Mac" diff --git a/Engine/source/platform/types.gcc.h b/Engine/source/platform/types.gcc.h index e7f0f6953..b562fc018 100644 --- a/Engine/source/platform/types.gcc.h +++ b/Engine/source/platform/types.gcc.h @@ -58,13 +58,13 @@ typedef unsigned long long U64; #if defined(_WIN64) # define TORQUE_OS_STRING "Win64" # define TORQUE_OS_WIN64 -# include "platform/types.win32.h" +# include "platform/types.win.h" #if defined(__WIN32__) || defined(_WIN32) # define TORQUE_OS_STRING "Win32" # define TORQUE_OS_WIN32 # define TORQUE_SUPPORTS_NASM # define TORQUE_SUPPORTS_GCC_INLINE_X86_ASM -# include "platform/types.win32.h" +# include "platform/types.win.h" #elif defined(SN_TARGET_PS3) # define TORQUE_OS_STRING "PS3" diff --git a/Engine/source/platform/types.visualc.h b/Engine/source/platform/types.visualc.h index 1ae8d5113..5b264e4bf 100644 --- a/Engine/source/platform/types.visualc.h +++ b/Engine/source/platform/types.visualc.h @@ -58,11 +58,11 @@ typedef unsigned _int64 U64; #elif defined( _XBOX_VER ) # define TORQUE_OS_STRING "Xbox" # define TORQUE_OS_XBOX -# include "platform/types.win32.h" +# include "platform/types.win.h" #elif defined( _WIN32 ) # define TORQUE_OS_STRING "Win32" # define TORQUE_OS_WIN32 -# include "platform/types.win32.h" +# include "platform/types.win.h" #elif defined( _WIN64 ) # define TORQUE_OS_STRING "Win64" # define TORQUE_OS_WIN64 diff --git a/Engine/source/platform/types.win32.h b/Engine/source/platform/types.win.h similarity index 100% rename from Engine/source/platform/types.win32.h rename to Engine/source/platform/types.win.h From 6d8e0d7e252c93cdb3ed003ec6bfc652fd3fe74a Mon Sep 17 00:00:00 2001 From: Thomas Fischer Date: Sat, 15 Mar 2014 15:10:14 +0100 Subject: [PATCH 4/4] refactored platform precompiler variable: TORQUE_OS_WIN{32,64,} --- Engine/source/T3D/physics/bullet/bt.h | 2 +- Engine/source/T3D/physics/physx/px.h | 2 +- Engine/source/T3D/physics/physx/pxPlugin.cpp | 2 +- Engine/source/cinterface/c_scripting.cpp | 4 ++-- Engine/source/cinterface/cinterface.cpp | 4 ++-- Engine/source/console/CMDscan.cpp | 2 +- Engine/source/console/CMDscan.l | 2 +- Engine/source/core/strings/stringFunctions.cpp | 10 +++++----- Engine/source/core/strings/stringFunctions.h | 2 +- Engine/source/core/util/path.h | 2 +- Engine/source/core/util/str.cpp | 2 +- Engine/source/gfx/D3D9/gfxD3D9CardProfiler.cpp | 2 +- Engine/source/gfx/gfxDevice.cpp | 4 ++-- Engine/source/platform/input/event.cpp | 2 +- .../platform/input/razerHydra/razerHydraDevice.cpp | 2 +- Engine/source/platform/platformCPUCount.cpp | 8 ++++---- Engine/source/platform/platformFileIO.cpp | 4 ++-- Engine/source/platform/platformNet.cpp | 2 +- Engine/source/platform/platformNetAsync.cpp | 2 +- Engine/source/platform/platformVolume.cpp | 4 ++-- Engine/source/platform/profiler.cpp | 4 ++-- Engine/source/platform/types.codewarrior.h | 2 ++ Engine/source/platform/types.gcc.h | 2 ++ Engine/source/platform/types.h | 2 +- Engine/source/platform/types.lint.h | 2 +- Engine/source/platform/types.visualc.h | 4 +++- Engine/source/platformWin32/threads/thread.cpp | 2 +- Engine/source/sfx/fmod/sfxFMODDevice.h | 2 +- Engine/source/sfx/fmod/sfxFMODProvider.cpp | 2 +- Engine/source/windowManager/platformInterface.cpp | 2 +- Tools/dae2dts/source/main.cpp | 2 +- 31 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Engine/source/T3D/physics/bullet/bt.h b/Engine/source/T3D/physics/bullet/bt.h index 45ae15414..b2c514ff5 100644 --- a/Engine/source/T3D/physics/bullet/bt.h +++ b/Engine/source/T3D/physics/bullet/bt.h @@ -24,7 +24,7 @@ #define _BULLET_H_ // NOTE: We set these defines which bullet needs here. -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN #define WIN32 #endif diff --git a/Engine/source/T3D/physics/physx/px.h b/Engine/source/T3D/physics/physx/px.h index c4dd9dccb..856035cf7 100644 --- a/Engine/source/T3D/physics/physx/px.h +++ b/Engine/source/T3D/physics/physx/px.h @@ -46,7 +46,7 @@ #define __APPLE__ #elif defined(TORQUE_OS_LINUX) && !defined(LINUX) #define LINUX -#elif defined(TORQUE_OS_WIN32) && !defined(WIN32) +#elif defined(TORQUE_OS_WIN) && !defined(WIN32) #define WIN32 #endif diff --git a/Engine/source/T3D/physics/physx/pxPlugin.cpp b/Engine/source/T3D/physics/physx/pxPlugin.cpp index 7fff0559e..bb3352983 100644 --- a/Engine/source/T3D/physics/physx/pxPlugin.cpp +++ b/Engine/source/T3D/physics/physx/pxPlugin.cpp @@ -39,7 +39,7 @@ AFTER_MODULE_INIT( Sim ) { NamedFactory::add( "PhysX", &PxPlugin::create ); - #if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) + #if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) NamedFactory::add( "default", &PxPlugin::create ); #endif diff --git a/Engine/source/cinterface/c_scripting.cpp b/Engine/source/cinterface/c_scripting.cpp index e6448089b..7a66feaec 100644 --- a/Engine/source/cinterface/c_scripting.cpp +++ b/Engine/source/cinterface/c_scripting.cpp @@ -29,7 +29,7 @@ // External scripting cinterface, suitable for import into any scripting system which support "C" interfaces (C#, Python, Lua, Java, etc) -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN #include "windowManager/win32/win32Window.h" #include "windowManager/win32/winDispatch.h" #endif @@ -383,7 +383,7 @@ extern "C" { } -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN void script_input_event(int type, int value1, int value2) { diff --git a/Engine/source/cinterface/cinterface.cpp b/Engine/source/cinterface/cinterface.cpp index f5b1c1412..c98b294cd 100644 --- a/Engine/source/cinterface/cinterface.cpp +++ b/Engine/source/cinterface/cinterface.cpp @@ -29,7 +29,7 @@ #include "windowManager/platformWindow.h" #include "windowManager/platformWindowMgr.h" -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN #include "windowManager/win32/win32Window.h" #include "windowManager/win32/winDispatch.h" extern void createFontInit(void); @@ -415,7 +415,7 @@ extern "C" { PlatformWindowManager::get()->getFirstWindow()->setSize(Point2I(width,height)); } -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN // retrieve the hwnd of our render window void* torque_gethwnd() { diff --git a/Engine/source/console/CMDscan.cpp b/Engine/source/console/CMDscan.cpp index 4ce606638..a72fdd44e 100644 --- a/Engine/source/console/CMDscan.cpp +++ b/Engine/source/console/CMDscan.cpp @@ -2355,7 +2355,7 @@ void CMDerror(char *format, ...) char tempBuf[BUFMAX]; va_list args; va_start( args, format ); -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN _vsnprintf( tempBuf, BUFMAX, format, args ); #else vsnprintf( tempBuf, BUFMAX, format, args ); diff --git a/Engine/source/console/CMDscan.l b/Engine/source/console/CMDscan.l index d6d37a5c6..cef682e89 100644 --- a/Engine/source/console/CMDscan.l +++ b/Engine/source/console/CMDscan.l @@ -245,7 +245,7 @@ void CMDerror(char *format, ...) char tempBuf[BUFMAX]; va_list args; va_start( args, format ); -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN _vsnprintf( tempBuf, BUFMAX, format, args ); #else vsnprintf( tempBuf, BUFMAX, format, args ); diff --git a/Engine/source/core/strings/stringFunctions.cpp b/Engine/source/core/strings/stringFunctions.cpp index 25c7e22b1..7f616386c 100644 --- a/Engine/source/core/strings/stringFunctions.cpp +++ b/Engine/source/core/strings/stringFunctions.cpp @@ -27,7 +27,7 @@ #include "platform/platform.h" -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) // This standard function is not defined when compiling with VC7... #define vsnprintf _vsnprintf #endif @@ -330,7 +330,7 @@ char* dStrcpyl(char *dst, dsize_t dstSize, ...) int dStrcmp( const UTF16 *str1, const UTF16 *str2) { -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) return wcscmp( reinterpret_cast( str1 ), reinterpret_cast( str2 ) ); #else int ret; @@ -347,7 +347,7 @@ int dStrcmp( const UTF16 *str1, const UTF16 *str2) char* dStrupr(char *str) { -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) return _strupr(str); #else if (str == NULL) @@ -365,7 +365,7 @@ char* dStrupr(char *str) char* dStrlwr(char *str) { -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) return _strlwr(str); #else if (str == NULL) @@ -421,7 +421,7 @@ S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, void *arglist) S32 dSscanf(const char *buffer, const char *format, ...) { -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) va_list args; va_start(args, format); diff --git a/Engine/source/core/strings/stringFunctions.h b/Engine/source/core/strings/stringFunctions.h index 34af03b9b..4dd5a56c9 100644 --- a/Engine/source/core/strings/stringFunctions.h +++ b/Engine/source/core/strings/stringFunctions.h @@ -31,7 +31,7 @@ #include "platform/types.h" #endif -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) // These standard functions are not defined on Win32 and other Microsoft platforms... #define strcasecmp _stricmp #define strncasecmp _strnicmp diff --git a/Engine/source/core/util/path.h b/Engine/source/core/util/path.h index 604b48f76..73cc5af13 100644 --- a/Engine/source/core/util/path.h +++ b/Engine/source/core/util/path.h @@ -40,7 +40,7 @@ class Path public: enum Separator { -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XENON) OsSeparator = '\\' #else OsSeparator = '/' diff --git a/Engine/source/core/util/str.cpp b/Engine/source/core/util/str.cpp index 9a89ef2a1..b9db7fd0e 100644 --- a/Engine/source/core/util/str.cpp +++ b/Engine/source/core/util/str.cpp @@ -1419,7 +1419,7 @@ void String::copy(StringChar* dst, const StringChar *src, U32 len) //----------------------------------------------------------------------------- -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) // This standard function is not defined when compiling with VC7... #define vsnprintf _vsnprintf #endif diff --git a/Engine/source/gfx/D3D9/gfxD3D9CardProfiler.cpp b/Engine/source/gfx/D3D9/gfxD3D9CardProfiler.cpp index a2fd892fe..988e3a4e2 100644 --- a/Engine/source/gfx/D3D9/gfxD3D9CardProfiler.cpp +++ b/Engine/source/gfx/D3D9/gfxD3D9CardProfiler.cpp @@ -25,7 +25,7 @@ #include "gfx/primBuilder.h" #include "gfx/D3D9/gfxD3D9CardProfiler.h" #include "gfx/D3D9/gfxD3D9EnumTranslate.h" -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN #include "platformWin32/videoInfo/wmiVideoInfo.h" #endif diff --git a/Engine/source/gfx/gfxDevice.cpp b/Engine/source/gfx/gfxDevice.cpp index fbf1f3c4b..ebca55e94 100644 --- a/Engine/source/gfx/gfxDevice.cpp +++ b/Engine/source/gfx/gfxDevice.cpp @@ -184,8 +184,8 @@ GFXDevice::GFXDevice() // Add a few system wide shader macros. GFXShader::addGlobalMacro( "TORQUE", "1" ); GFXShader::addGlobalMacro( "TORQUE_VERSION", String::ToString(getVersionNumber()) ); - #if defined TORQUE_OS_WIN32 - GFXShader::addGlobalMacro( "TORQUE_OS_WIN32" ); + #if defined TORQUE_OS_WIN + GFXShader::addGlobalMacro( "TORQUE_OS_WIN" ); #elif defined TORQUE_OS_MAC GFXShader::addGlobalMacro( "TORQUE_OS_MAC" ); #elif defined TORQUE_OS_LINUX diff --git a/Engine/source/platform/input/event.cpp b/Engine/source/platform/input/event.cpp index 254aca29d..287a377fc 100644 --- a/Engine/source/platform/input/event.cpp +++ b/Engine/source/platform/input/event.cpp @@ -381,7 +381,7 @@ CodeMapping gVirtualMap[] = { "lpov2", SI_POV, SI_LPOV2 }, { "rpov2", SI_POV, SI_RPOV2 }, -#if defined( TORQUE_OS_WIN32 ) || defined( TORQUE_OS_XENON ) +#if defined( TORQUE_OS_WIN ) || defined( TORQUE_OS_XENON ) //-------------------------------------- XINPUT EVENTS // Controller connect / disconnect: { "connect", SI_BUTTON, XI_CONNECT }, diff --git a/Engine/source/platform/input/razerHydra/razerHydraDevice.cpp b/Engine/source/platform/input/razerHydra/razerHydraDevice.cpp index 89dd771f3..8a36bd9d6 100644 --- a/Engine/source/platform/input/razerHydra/razerHydraDevice.cpp +++ b/Engine/source/platform/input/razerHydra/razerHydraDevice.cpp @@ -260,7 +260,7 @@ bool RazerHydraDevice::enable() #endif const char* dllName; -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN #ifdef TORQUE_DEBUG dllName = "sixensed.dll"; #else diff --git a/Engine/source/platform/platformCPUCount.cpp b/Engine/source/platform/platformCPUCount.cpp index 116251e08..abd81a975 100644 --- a/Engine/source/platform/platformCPUCount.cpp +++ b/Engine/source/platform/platformCPUCount.cpp @@ -53,7 +53,7 @@ EConfig CPUCount(U32& TotAvailLogical, U32& TotAvailCore, U32& PhysicalNum) #include #include #define DWORD unsigned long -#elif defined( TORQUE_OS_WIN32 ) +#elif defined( TORQUE_OS_WIN ) #include #elif defined( TORQUE_OS_MAC ) # include @@ -476,7 +476,7 @@ next: if ( CPU_ISSET(i, &allowedCPUs) == 0 ) return CONFIG_UserConfigIssue; } -#elif defined( TORQUE_OS_WIN32 ) +#elif defined( TORQUE_OS_WIN ) DWORD dwProcessAffinity, dwSystemAffinity; GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinity, @@ -504,7 +504,7 @@ next: if ( sched_setaffinity (0, sizeof(currentCPU), ¤tCPU) == 0 ) { sleep(0); // Ensure system to switch to the right CPU -#elif defined( TORQUE_OS_WIN32 ) +#elif defined( TORQUE_OS_WIN ) while (dwAffinityMask && dwAffinityMask <= dwSystemAffinity) { if (SetThreadAffinityMask(GetCurrentThread(), dwAffinityMask)) @@ -549,7 +549,7 @@ next: #ifdef TORQUE_OS_LINUX sched_setaffinity (0, sizeof(allowedCPUs), &allowedCPUs); sleep(0); -#elif defined( TORQUE_OS_WIN32 ) +#elif defined( TORQUE_OS_WIN ) SetThreadAffinityMask(GetCurrentThread(), dwProcessAffinity); Sleep(0); #else diff --git a/Engine/source/platform/platformFileIO.cpp b/Engine/source/platform/platformFileIO.cpp index 0209f239e..fc42c0565 100644 --- a/Engine/source/platform/platformFileIO.cpp +++ b/Engine/source/platform/platformFileIO.cpp @@ -140,7 +140,7 @@ inline void catPath(char *dst, const char *src, U32 len) // converts the posix root path "/" to "c:/" for win32 // FIXME: this is not ideal. the c: drive is not guaranteed to exist. -#if defined(TORQUE_OS_WIN32) +#if defined(TORQUE_OS_WIN) static inline void _resolveLeadingSlash(char* buf, U32 size) { if(buf[0] != '/') @@ -227,7 +227,7 @@ char * Platform::makeFullPathName(const char *path, char *buffer, U32 size, cons if(Platform::isFullPath(bspath)) { // Already a full path - #if defined(TORQUE_OS_WIN32) + #if defined(TORQUE_OS_WIN) _resolveLeadingSlash(bspath, sizeof(bspath)); #endif dStrncpy(buffer, bspath, size); diff --git a/Engine/source/platform/platformNet.cpp b/Engine/source/platform/platformNet.cpp index 786fcf62d..5542ef6b8 100644 --- a/Engine/source/platform/platformNet.cpp +++ b/Engine/source/platform/platformNet.cpp @@ -23,7 +23,7 @@ #include "platform/platformNet.h" #include "core/strings/stringFunctions.h" -#if defined (TORQUE_OS_WIN32) +#if defined (TORQUE_OS_WIN) #define TORQUE_USE_WINSOCK #include #include diff --git a/Engine/source/platform/platformNetAsync.cpp b/Engine/source/platform/platformNetAsync.cpp index 8f246d39f..cb1f4e42c 100644 --- a/Engine/source/platform/platformNetAsync.cpp +++ b/Engine/source/platform/platformNetAsync.cpp @@ -25,7 +25,7 @@ #include "platform/threads/threadPool.h" #include "console/console.h" -#if defined(TORQUE_OS_WIN32) +#if defined(TORQUE_OS_WIN) # include #elif defined(TORQUE_OS_XENON) # include diff --git a/Engine/source/platform/platformVolume.cpp b/Engine/source/platform/platformVolume.cpp index 526e5d0a3..9304ea891 100644 --- a/Engine/source/platform/platformVolume.cpp +++ b/Engine/source/platform/platformVolume.cpp @@ -22,7 +22,7 @@ #include "platform/platform.h" -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) #include #else #include @@ -84,7 +84,7 @@ bool MountZips(const String &root) bool Touch( const Path &path ) { -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) return( utime( path.getFullPath(), 0 ) != -1 ); #else return( utimes( path.getFullPath(), NULL) == 0 ); // utimes returns 0 on success. diff --git a/Engine/source/platform/profiler.cpp b/Engine/source/platform/profiler.cpp index f97100f09..8aaf483ef 100644 --- a/Engine/source/platform/profiler.cpp +++ b/Engine/source/platform/profiler.cpp @@ -22,7 +22,7 @@ #include "platform/platform.h" -#if defined(TORQUE_OS_WIN32) +#if defined(TORQUE_OS_WIN) #include // for SetThreadAffinityMask #endif @@ -462,7 +462,7 @@ void Profiler::hashPop(ProfilerRootData *expected) if(!mEnabled && mNextEnable) startHighResolutionTimer(mCurrentProfilerData->mStartTime); -#if defined(TORQUE_OS_WIN32) +#if defined(TORQUE_OS_WIN) // The high performance counters under win32 are unreliable when running on multiple // processors. When the profiler is enabled, we restrict Torque to a single processor. if(mNextEnable != mEnabled) diff --git a/Engine/source/platform/types.codewarrior.h b/Engine/source/platform/types.codewarrior.h index f01f312ae..db0d60400 100644 --- a/Engine/source/platform/types.codewarrior.h +++ b/Engine/source/platform/types.codewarrior.h @@ -53,10 +53,12 @@ typedef unsigned long long U64; ///< Compiler independent Unsigned 64-bit in // Identify the Operating System #if defined(_WIN64) # define TORQUE_OS_STRING "Win64" +# define TORQUE_OS_WIN # define TORQUE_OS_WIN64 # include "platform/types.win.h" #if defined(_WIN32) # define TORQUE_OS_STRING "Win32" +# define TORQUE_OS_WIN # define TORQUE_OS_WIN32 # include "platform/types.win.h" diff --git a/Engine/source/platform/types.gcc.h b/Engine/source/platform/types.gcc.h index b562fc018..76a9a7eab 100644 --- a/Engine/source/platform/types.gcc.h +++ b/Engine/source/platform/types.gcc.h @@ -57,10 +57,12 @@ typedef unsigned long long U64; // Identify the Operating System #if defined(_WIN64) # define TORQUE_OS_STRING "Win64" +# define TORQUE_OS_WIN # define TORQUE_OS_WIN64 # include "platform/types.win.h" #if defined(__WIN32__) || defined(_WIN32) # define TORQUE_OS_STRING "Win32" +# define TORQUE_OS_WIN # define TORQUE_OS_WIN32 # define TORQUE_SUPPORTS_NASM # define TORQUE_SUPPORTS_GCC_INLINE_X86_ASM diff --git a/Engine/source/platform/types.h b/Engine/source/platform/types.h index c53bd87fc..937735444 100644 --- a/Engine/source/platform/types.h +++ b/Engine/source/platform/types.h @@ -290,7 +290,7 @@ inline double getMax(double a, double b) #define BIT(x) (1 << (x)) ///< Returns value with bit x set (2^x) -#if defined(TORQUE_OS_WIN32) +#if defined(TORQUE_OS_WIN) #define STDCALL __stdcall #else #define STDCALL diff --git a/Engine/source/platform/types.lint.h b/Engine/source/platform/types.lint.h index fff33d28d..f2268e9a2 100644 --- a/Engine/source/platform/types.lint.h +++ b/Engine/source/platform/types.lint.h @@ -39,7 +39,7 @@ struct FileTime #define TORQUE_LITTLE_ENDIAN #define TORQUE_SUPPORTS_NASM #define TORQUE_SUPPORTS_VC_INLINE_X86_ASM -#define TORQUE_OS_WIN32 +#define TORQUE_OS_WIN #define TORQUE_COMPILER_VISUALC 1500 #ifndef FN_CDECL diff --git a/Engine/source/platform/types.visualc.h b/Engine/source/platform/types.visualc.h index 5b264e4bf..2104565bb 100644 --- a/Engine/source/platform/types.visualc.h +++ b/Engine/source/platform/types.visualc.h @@ -61,12 +61,14 @@ typedef unsigned _int64 U64; # include "platform/types.win.h" #elif defined( _WIN32 ) # define TORQUE_OS_STRING "Win32" +# define TORQUE_OS_WIN # define TORQUE_OS_WIN32 # include "platform/types.win.h" #elif defined( _WIN64 ) # define TORQUE_OS_STRING "Win64" +# define TORQUE_OS_WIN # define TORQUE_OS_WIN64 -# include "platform/types.win32.h" +# include "platform/types.win.h" #else # error "VC: Unsupported Operating System" #endif diff --git a/Engine/source/platformWin32/threads/thread.cpp b/Engine/source/platformWin32/threads/thread.cpp index 6e66ddc6d..772d6ba29 100644 --- a/Engine/source/platformWin32/threads/thread.cpp +++ b/Engine/source/platformWin32/threads/thread.cpp @@ -164,7 +164,7 @@ U32 Thread::getId() void Thread::_setName( const char* name ) { -#if defined( TORQUE_DEBUG ) && defined( TORQUE_COMPILER_VISUALC ) && defined( TORQUE_OS_WIN32 ) +#if defined( TORQUE_DEBUG ) && defined( TORQUE_COMPILER_VISUALC ) && defined( TORQUE_OS_WIN ) // See http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx diff --git a/Engine/source/sfx/fmod/sfxFMODDevice.h b/Engine/source/sfx/fmod/sfxFMODDevice.h index df90eae0d..f710faa20 100644 --- a/Engine/source/sfx/fmod/sfxFMODDevice.h +++ b/Engine/source/sfx/fmod/sfxFMODDevice.h @@ -59,7 +59,7 @@ // This doesn't appear to exist in some contexts, so let's just add it. -#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XENON) +#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XENON) #ifndef WINAPI #define WINAPI __stdcall #endif diff --git a/Engine/source/sfx/fmod/sfxFMODProvider.cpp b/Engine/source/sfx/fmod/sfxFMODProvider.cpp index f11996c97..a55609a89 100644 --- a/Engine/source/sfx/fmod/sfxFMODProvider.cpp +++ b/Engine/source/sfx/fmod/sfxFMODProvider.cpp @@ -169,7 +169,7 @@ void SFXFMODProvider::init() const char* pDllName; // plugin-based DLL const char* eventDllName; -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN dllName = "fmodex.dll"; pDllName = "fmodexp.dll"; eventDllName = "fmod_event.dll"; diff --git a/Engine/source/windowManager/platformInterface.cpp b/Engine/source/windowManager/platformInterface.cpp index ff34d37db..30ec96c40 100644 --- a/Engine/source/windowManager/platformInterface.cpp +++ b/Engine/source/windowManager/platformInterface.cpp @@ -121,7 +121,7 @@ void Platform::closeWindow() -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN // Hack so we can get the HWND of the global window more easily - replacement // for the HWND that was in the platstate. #include "windowManager/win32/win32Window.h" diff --git a/Tools/dae2dts/source/main.cpp b/Tools/dae2dts/source/main.cpp index 64a78c82e..f92b9fa24 100644 --- a/Tools/dae2dts/source/main.cpp +++ b/Tools/dae2dts/source/main.cpp @@ -31,7 +31,7 @@ #include "ts/tsShape.h" #include "ts/tsShapeConstruct.h" -#ifdef TORQUE_OS_WIN32 +#ifdef TORQUE_OS_WIN #include "platformWin32/platformWin32.h" #include "platformWin32/winConsole.h" #endif