bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Win64 build support

Browse Source
This commit is contained in:
Ianos Gnatiuc 2006-09-24 14:26:09 +00:00
parent cba60db399
commit abc9111f96
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
golded3/golded3.cpp
View File

@ -98,16 +98,29 @@
#define __GVER_SHORTLOGNAME__ "2" #define __GVER_SHORTLOGNAME__ "2"
#define __GVER_CFGEXT__ ".geo" #define __GVER_CFGEXT__ ".geo"
#elif defined(__WIN32__) #elif defined(__WIN32__)
#if defined(_MSC_VER) #if defined(_M_X64)
#define __GVER_PLATFORM__ "/W32-MSVC" #if defined(_MSC_VER)
#elif defined(__MINGW32__) #define __GVER_PLATFORM__ "/W64-MSVC"
#define __GVER_PLATFORM__ "/W32-MINGW" #elif defined(__MINGW32__)
#else #define __GVER_PLATFORM__ "/W64-MINGW"
#define __GVER_PLATFORM__ "/W32" #else
#endif #define __GVER_PLATFORM__ "/W64"
#define __GVER_SHORTPLATFORM__ "W32" #endif
#define __GVER_SHORTLOGNAME__ "W" #define __GVER_SHORTPLATFORM__ "W64"
#define __GVER_CFGEXT__ ".gew" #define __GVER_SHORTLOGNAME__ "W"
#define __GVER_CFGEXT__ ".gew"
#else
#if defined(_MSC_VER)
#define __GVER_PLATFORM__ "/W32-MSVC"
#elif defined(__MINGW32__)
#define __GVER_PLATFORM__ "/W32-MINGW"
#else
#define __GVER_PLATFORM__ "/W32"
#endif
#define __GVER_SHORTPLATFORM__ "W32"
#define __GVER_SHORTLOGNAME__ "W"
#define __GVER_CFGEXT__ ".gew"
#endif
#elif defined(__linux__) #elif defined(__linux__)
#define __GVER_PLATFORM__ "/LNX" #define __GVER_PLATFORM__ "/LNX"
#define __GVER_SHORTPLATFORM__ "LNX" #define __GVER_SHORTPLATFORM__ "LNX"

19
goldlib/gall/gutlvers.cpp
View File

@ -49,6 +49,12 @@
// ------------------------------------------------------------------ // ------------------------------------------------------------------
#if defined(_M_X64)
inline static bool HaveCPUID()
{
return false;
}
#else
inline static bool HaveCPUID() inline static bool HaveCPUID()
{ {
// TO_PORT_TAG: CPUID // TO_PORT_TAG: CPUID
@ -73,6 +79,7 @@ inline static bool HaveCPUID()
return false; return false;
#endif #endif
} }
#endif
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@ -326,12 +333,17 @@ static void cpuname(int family, int model, const char *v_name, char *m_name)
// ------------------------------------------------------------------ // ------------------------------------------------------------------
#if defined(_M_X64)
char *gcpuid(char *_cpuname)
{
return "";
}
#else
char *gcpuid(char *_cpuname) char *gcpuid(char *_cpuname)
{ {
#if defined(__GNUC__) && defined(__i386__) || defined(_MSC_VER) #if defined(__GNUC__) && defined(__i386__) || defined(_MSC_VER)
static struct scpuid_t
static struct scpuid_t{ {
dword cpu; /* x86, where x=cpu */ dword cpu; /* x86, where x=cpu */
dword cpu_high; /* highest CPUID capability */ dword cpu_high; /* highest CPUID capability */
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -541,6 +553,7 @@ char *gcpuid(char *_cpuname)
return _cpuname; return _cpuname;
} }
#endif
// ------------------------------------------------------------------ // ------------------------------------------------------------------