From 5a28ccec8cb4287b98f32c23464161fac88f47ef Mon Sep 17 00:00:00 2001 From: nillerusr Date: Sat, 17 Sep 2022 15:57:17 +0300 Subject: [PATCH] game(client): fix touch drawing --- game/client/c_baseplayer.cpp | 2 +- game/client/hud_basechat.cpp | 3 --- scripts/waifulib/compiler_optimizations.py | 4 ++-- wscript | 15 ++++++++------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/game/client/c_baseplayer.cpp b/game/client/c_baseplayer.cpp index 942f7a37..9b3b8c8c 100644 --- a/game/client/c_baseplayer.cpp +++ b/game/client/c_baseplayer.cpp @@ -87,7 +87,7 @@ extern ConVar sensitivity; static C_BasePlayer *s_pLocalPlayer = NULL; -static ConVar cl_customsounds ( "cl_customsounds", "0", 0, "Enable customized player sound playback" ); +static ConVar cl_customsounds ( "cl_customsounds", "1", 0, "Enable customized player sound playback" ); static ConVar spec_track ( "spec_track", "0", 0, "Tracks an entity in spec mode" ); static ConVar cl_smooth ( "cl_smooth", "1", 0, "Smooth view/eye origin after prediction errors" ); static ConVar cl_smoothtime ( diff --git a/game/client/hud_basechat.cpp b/game/client/hud_basechat.cpp index 41d54447..d06a3200 100644 --- a/game/client/hud_basechat.cpp +++ b/game/client/hud_basechat.cpp @@ -37,9 +37,6 @@ ConVar cl_showtextmsg( "cl_showtextmsg", "1", 0, "Enable/disable text messages p ConVar cl_chatfilters( "cl_chatfilters", "63", FCVAR_CLIENTDLL | FCVAR_ARCHIVE, "Stores the chat filter settings " ); ConVar cl_chatfilter_version( "cl_chatfilter_version", "0", FCVAR_CLIENTDLL | FCVAR_ARCHIVE | FCVAR_HIDDEN, "Stores the chat filter version" ); -#undef IsAndroid -#define IsAndroid() 1 - const int kChatFilterVersion = 1; Color g_ColorBlue( 153, 204, 255, 255 ); diff --git a/scripts/waifulib/compiler_optimizations.py b/scripts/waifulib/compiler_optimizations.py index bd5a20b6..94f10ae9 100644 --- a/scripts/waifulib/compiler_optimizations.py +++ b/scripts/waifulib/compiler_optimizations.py @@ -48,7 +48,7 @@ CFLAGS = { 'common': { # disable thread-safe local static initialization for C++11 code, as it cause crashes on Windows XP 'msvc': ['/D_USING_V110_SDK71_', '/Zi', '/FS', '/Zc:threadSafeInit-'], - 'clang': ['-g0', '-fno-strict-aliasing'], + 'clang': ['-fno-strict-aliasing'], 'gcc': ['-g0', '-fno-strict-aliasing', '-fvisibility=hidden'], 'owcc': ['-fno-short-enum', '-ffloat-store', '-g0'] }, @@ -67,7 +67,7 @@ CFLAGS = { 'release': { 'msvc': ['/O2', '/MT'], 'owcc': ['-O3', '-fomit-leaf-frame-pointer', '-fomit-frame-pointer', '-finline-functions', '-finline-limit=512'], - 'default': ['-O2', '-funsafe-math-optimizations', '-ftree-vectorize'] + 'default': ['-O2', '-funsafe-math-optimizations', '-ftree-vectorize', '-ffast-math'] }, 'debug': { 'msvc': ['/Od', '/MTd'], diff --git a/wscript b/wscript index 617af682..56f55fa6 100644 --- a/wscript +++ b/wscript @@ -454,13 +454,14 @@ def configure(conf): else: conf.check(lib='SDL2', uselib_store='SDL2') conf.check(lib='freetype2', uselib_store='FT2') - conf.check(lib='openal', uselib_store='OPENAL') - conf.check(lib='jpeg', uselib_store='JPEG') - conf.check(lib='png', uselib_store='PNG') - conf.check(lib='curl', uselib_store='CURL') - conf.check(lib='z', uselib_store='ZLIB') - conf.check(lib='crypto', uselib_store='CRYPTO') - conf.check(lib='ssl', uselib_store='SSL') + conf.check(lib='jpeg', uselib_store='JPEG', define_name='HAVE_JPEG') + conf.check(lib='png', uselib_store='PNG', define_name='HAVE_PNG') + conf.check(lib='curl', uselib_store='CURL', define_name='HAVE_CURL') + conf.check(lib='z', uselib_store='ZLIB', define_name='HAVE_ZLIB') + if conf.env.DEST_CPU != 'aarch64': + conf.check(lib='unwind', uselib_store='UNWIND') + conf.check(lib='crypto', uselib_store='CRYPTO') + conf.check(lib='ssl', uselib_store='SSL') conf.check(lib='android_support', uselib_store='ANDROID_SUPPORT') conf.check(lib='opus', uselib_store='OPUS')