Merge branch 'master' into blackops

This commit is contained in:
Andrey Akhmichin 2021-09-17 23:14:42 +05:00
commit c17c9143fc
13 changed files with 67 additions and 25 deletions

View File

@ -72,7 +72,7 @@ jobs:
if: startsWith(matrix.os, 'windows')
run: |
cmake -G "Visual Studio 15 2017" -B build -DGOLDSOURCE_SUPPORT=ON -DCMAKE_INSTALL_PREFIX="dist"
msbuild build/INSTALL.vcxproj
msbuild -verbosity:normal /property:Configuration=Release build/INSTALL.vcxproj
- name: Extract branch name
shell: bash

View File

@ -22,6 +22,10 @@
cmake_minimum_required(VERSION 2.8.12)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.15.0")
cmake_policy(SET CMP0091 NEW)
endif()
# Install custom module path
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")

View File

@ -37,8 +37,6 @@ These scripts also can be ran via wine:
The libraries built this way are always GoldSource compatible.
There're dsp projects for Visual Studio 6 in `cl_dll` and `dlls` directories, but we don't keep them up-to-date. You're free to adapt them for yourself and try to import into the newer Visual Studio versions.
#### Using mingw
TODO

View File

@ -16,6 +16,7 @@ build:
configuration:
- Debug
- Release
before_build:
- git submodule update --init --recursive

View File

@ -148,6 +148,10 @@ if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
PREFIX "")
endif()
if(MSVC)
set_property(TARGET ${CLDLL_LIBRARY} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()
install( TARGETS ${CLDLL_LIBRARY}
DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE

View File

@ -153,6 +153,9 @@ void DLLEXPORT CAM_Think( void )
#endif
vec3_t viewangles;
if( gEngfuncs.GetMaxClients() > 1 && CL_IsThirdPerson() )
CAM_ToFirstPerson();
switch( (int)cam_command->value )
{
case CAM_COMMAND_TOTHIRDPERSON:

View File

@ -25,6 +25,7 @@
#include "screenfade.h"
#include "shake.h"
#include "hltv.h"
#include "view.h"
// Spectator Mode
extern "C"
@ -36,14 +37,6 @@ extern "C"
int iIsSpectator;
}
#if !defined(M_PI)
#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
#endif
#if !defined(M_PI_F)
#define M_PI_F (float)M_PI
#endif
extern "C"
{
int CL_IsThirdPerson( void );

View File

@ -9,6 +9,14 @@
#define VIEWH
#pragma once
#if !defined(M_PI)
#define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
#endif
#if !defined(M_PI_F)
#define M_PI_F (float)M_PI
#endif
void V_StartPitchDrift( void );
void V_StopPitchDrift( void );
#endif // !VIEWH

View File

@ -178,6 +178,10 @@ if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
PREFIX "")
endif()
if(MSVC)
set_property(TARGET ${SVDLL_LIBRARY} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()
install( TARGETS ${SVDLL_LIBRARY}
DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/"
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE

View File

@ -571,7 +571,8 @@ void CBaseMonster::MonsterThink( void )
//=========================================================
void CBaseMonster::MonsterUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value )
{
m_IdealMonsterState = MONSTERSTATE_ALERT;
if (m_MonsterState == MONSTERSTATE_IDLE)
m_IdealMonsterState = MONSTERSTATE_ALERT;
}
//=========================================================

View File

@ -664,7 +664,7 @@ void ScriptEntityCancel( edict_t *pentCine )
if( pTarget )
{
// make sure their monster is actually playing a script
if( pTarget->m_MonsterState == MONSTERSTATE_SCRIPT )
if( pTarget->m_MonsterState == MONSTERSTATE_SCRIPT || pTarget->m_IdealMonsterState == MONSTERSTATE_SCRIPT )
{
// tell them do die
pTarget->m_scriptState = CCineMonster::SCRIPT_CLEANUP;

View File

@ -152,6 +152,8 @@ class Android:
def gen_host_toolchain(self):
# With host toolchain we don't care about OS
# so just download NDK for Linux x86_64
if 'HOST_TOOLCHAIN' in self.ctx.environ:
return self.ctx.environ['HOST_TOOLCHAIN']
if self.is_host():
return 'linux-x86_64'
@ -198,16 +200,32 @@ class Android:
def cc(self):
if self.is_host():
return 'clang --target=%s%d' % (self.ndk_triplet(), self.api)
s = 'clang'
environ = getattr(self.ctx, 'environ', os.environ)
if 'CC' in environ:
s = environ['CC']
return '%s --target=%s%d' % (s, self.ndk_triplet(), self.api)
return self.gen_toolchain_path() + ('clang' if self.is_clang() else 'gcc')
def cxx(self):
if self.is_host():
return 'clang++ --target=%s%d' % (self.ndk_triplet(), self.api)
s = 'clang++'
environ = getattr(self.ctx, 'environ', os.environ)
if 'CXX' in environ:
s = environ['CXX']
return '%s --target=%s%d' % (s, self.ndk_triplet(), self.api)
return self.gen_toolchain_path() + ('clang++' if self.is_clang() else 'g++')
def strip(self):
if self.is_host():
environ = getattr(self.ctx, 'environ', os.environ)
if 'STRIP' in environ:
return environ['STRIP']
return 'llvm-strip'
return os.path.join(self.gen_binutils_path(), 'strip')
@ -281,7 +299,7 @@ class Android:
cflags += fixup_host_clang_with_old_ndk()
# ARMv5 support
cflags += ['-march=armv5te', '-mtune=xscale', '-msoft-float']
cflags += ['-march=armv5te', '-msoft-float']
elif self.is_x86():
cflags += ['-mtune=atom', '-march=atom', '-mssse3', '-mfpmath=sse', '-DVECTORIZE_SINCOS', '-DHAVE_EFFICIENT_UNALIGNED_ACCESS']
return cflags
@ -300,7 +318,7 @@ class Android:
if self.is_clang() or self.is_host():
linkflags += ['-fuse-ld=lld']
linkflags += ['-Wl,--hash-style=both','-Wl,--no-undefined']
linkflags += ['-Wl,--hash-style=sysv', '-Wl,--no-undefined', '-no-canonical-prefixes']
return linkflags
def ldflags(self):
@ -325,6 +343,10 @@ def options(opt):
android.add_option('--android', action='store', dest='ANDROID_OPTS', default=None,
help='enable building for android, format: --android=<arch>,<toolchain>,<api>, example: --android=armeabi-v7a-hard,4.9,9')
magx = opt.add_option_group('MotoMAGX options')
magx.add_option('--enable-magx', action = 'store_true', dest = 'MAGX', default = False,
help = 'enable targetting for MotoMAGX phones [default: %default]')
def configure(conf):
if conf.options.ANDROID_OPTS:
values = conf.options.ANDROID_OPTS.split(',')
@ -360,7 +382,14 @@ def configure(conf):
# conf.env.ANDROID_OPTS = android
conf.env.DEST_OS2 = 'android'
elif conf.options.MAGX:
# useless to change toolchain path, as toolchain meant to be placed in this path
toolchain_path = '/opt/toolchains/motomagx/arm-eabi2/lib/'
conf.env.INCLUDES_MAGX = [toolchain_path + i for i in ['ezx-z6/include', 'qt-2.3.8/include']]
conf.env.LIBPATH_MAGX = [toolchain_path + i for i in ['ezx-z6/lib', 'qt-2.3.8/lib']]
conf.env.LINKFLAGS_MAGX = ['-Wl,-rpath-link=' + i for i in conf.env.LIBPATH_MAGX]
conf.env.MAGX = conf.options.MAGX
MACRO_TO_DESTOS = OrderedDict({ '__ANDROID__' : 'android' })
for k in c_config.MACRO_TO_DESTOS:
MACRO_TO_DESTOS[k] = c_config.MACRO_TO_DESTOS[k] # ordering is important
@ -375,6 +404,10 @@ def post_compiler_cxx_configure(conf):
if conf.android.ndk_rev == 19:
conf.env.CXXFLAGS_cxxshlib += ['-static-libstdc++']
conf.env.LDFLAGS_cxxshlib += ['-static-libstdc++']
elif conf.options.MAGX:
for lib in ['qte-mt', 'ezxappbase', 'ezxpm', 'log_util']:
conf.check_cc(lib=lib, use='MAGX', uselib_store='MAGX')
return
def post_compiler_c_configure(conf):

View File

@ -40,12 +40,6 @@ def options(opt):
grp.add_option('--enable-poly-opt', action = 'store_true', dest = 'POLLY', default = False,
help = 'enable polyhedral optimization if possible [default: %default]')
grp.add_option('--enable-magx', action = 'store_true', dest = 'MAGX', default = False,
help = 'enable targetting for MotoMAGX phones [default: %default]')
grp.add_option('--enable-simple-mod-hacks', action = 'store_true', dest = 'ENABLE_MOD_HACKS', default = False,
help = 'enable hacks for simple mods that mostly compatible with Half-Life but has little changes. Enforced for Android. [default: %default]')
opt.load('subproject')
opt.add_subproject(['cl_dll', 'dlls'])
@ -111,8 +105,7 @@ def configure(conf):
conf.options.GOLDSRC = False
conf.env.SERVER_NAME = 'server' # can't be any other name, until specified
conf.env.MAGX = conf.options.MAGX
if conf.options.MAGX:
if conf.env.MAGX:
enforce_pic = False
conf.check_pic(enforce_pic)