mirror of
https://github.com/alliedmodders/metamod-source.git
synced 2025-02-21 14:54:14 +01:00
Build Dota core and loader + versionlib as 64-bit.
TODO: we need both x86 and x64 of versionlib and loader.
This commit is contained in:
parent
4007ae8310
commit
a88de796a3
@ -280,6 +280,13 @@ class MMSConfig(object):
|
||||
else:
|
||||
compiler.defines += ['COMPILER_GCC']
|
||||
|
||||
if sdk.name == 'dota' and builder.target_platform in ['linux', 'mac']:
|
||||
compiler.defines += ['X64BITS', 'PLATFORM_64BITS']
|
||||
compiler.cflags.remove('-m32')
|
||||
compiler.cflags += ['-m64', '-fPIC']
|
||||
compiler.linkflags.remove('-m32')
|
||||
compiler.linkflags += ['-m64']
|
||||
|
||||
if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota']:
|
||||
if builder.target_platform in ['linux', 'mac']:
|
||||
compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
|
||||
|
@ -104,10 +104,6 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength);
|
||||
typedef unsigned __int32 uint32_t;
|
||||
#elif defined __GNUC__
|
||||
#include <stdint.h>
|
||||
#if !__GLIBC_HAVE_LONG_LONG
|
||||
typedef long long int64_t;
|
||||
typedef unsigned long long uint64_t;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if !defined __linux__ && !defined __APPLE__
|
||||
|
@ -13,6 +13,11 @@ def configure_library(name, linux_defines):
|
||||
|
||||
if builder.target_platform == 'linux':
|
||||
binary.compiler.defines += linux_defines
|
||||
# Temporary Source2 hack. Always build linux with -m64
|
||||
binary.compiler.cflags.remove('-m32')
|
||||
binary.compiler.cflags += ['-m64', '-fPIC']
|
||||
binary.compiler.linkflags.remove('-m32')
|
||||
binary.compiler.linkflags += ['-m64']
|
||||
|
||||
nodes = builder.Add(binary)
|
||||
MMS.binaries += [nodes]
|
||||
|
@ -6,6 +6,13 @@ lib.compiler.sourcedeps += MMS.generated_headers
|
||||
lib.sources += [
|
||||
'versionlib.cpp'
|
||||
]
|
||||
|
||||
# Temporary Source2 hack. Always build linux with -m64
|
||||
if builder.target_platform == 'linux':
|
||||
lib.compiler.cflags.remove('-m32')
|
||||
lib.compiler.cflags += ['-m64', '-fPIC']
|
||||
|
||||
|
||||
cmd = builder.Add(lib)
|
||||
|
||||
rvalue = cmd.binary
|
||||
|
Loading…
x
Reference in New Issue
Block a user