Browse Source

tier0: fix cpu freq on some arm cpu's

pull/96/head
nillerusr 2 years ago
parent
commit
79e83bb97f
  1. 2
      tier0/cpu_posix.cpp
  2. 3
      wscript

2
tier0/cpu_posix.cpp

@ -180,6 +180,6 @@ uint64 CalculateCPUFreq()
return period; return period;
#endif #endif
return (uint64)0; return (uint64)2000000000;
} }

3
wscript

@ -271,12 +271,9 @@ def configure(conf):
if conf.options.OPUS or conf.env.DEST_OS == 'android': if conf.options.OPUS or conf.env.DEST_OS == 'android':
projects['game'] += ['engine/voice_codecs/opus'] projects['game'] += ['engine/voice_codecs/opus']
if conf.env.DEST_OS in ['win32', 'linux', 'darwin'] and conf.env.DEST_CPU in ['x86_64', 'amd64']:
conf.env.BIT32_MANDATORY = not conf.options.ALLOW64 conf.env.BIT32_MANDATORY = not conf.options.ALLOW64
if conf.env.BIT32_MANDATORY: if conf.env.BIT32_MANDATORY:
Logs.info('WARNING: will build engine for 32-bit target') Logs.info('WARNING: will build engine for 32-bit target')
else:
conf.env.BIT32_MANDATORY = False
conf.load('force_32bit') conf.load('force_32bit')

Loading…
Cancel
Save