From 209a03a12a3db75a9a1ec3a539934d754c3e87ee Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 9 Jan 2023 08:01:52 +0300 Subject: [PATCH] engine, public: prepare to removal of XASH_MSVC macro --- engine/common/lib_common.c | 12 +++++++++++- engine/common/system.c | 2 +- public/xash3d_mathlib.h | 4 ---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/engine/common/lib_common.c b/engine/common/lib_common.c index cdd3f8b6..7ead7a92 100644 --- a/engine/common/lib_common.c +++ b/engine/common/lib_common.c @@ -65,7 +65,7 @@ void *COM_FunctionFromName_SR( void *hInstance, const char *pName ) if( f ) return f; } -#elif XASH_MSVC +#elif _MSC_VER // TODO: COM_ConvertToLocalPlatform doesn't support MSVC yet // also custom loader strips always MSVC mangling, so Win32 // platforms already use platform-neutral names @@ -126,6 +126,16 @@ dll_user_t *FS_FindLibrary( const char *dllname, qboolean directpath ) ============================================================================= */ +enum +{ + +}; + +static void COM_GenerateCommonLibraryName( const char *name, const char *ext, int os, int cpu, char *out, size_t size ) +{ + +} + static void COM_GenerateCommonLibraryName( const char *name, const char *ext, char *out, size_t size ) { #if ( XASH_WIN32 || XASH_LINUX || XASH_APPLE ) && XASH_X86 diff --git a/engine/common/system.c b/engine/common/system.c index 7da49d88..6df8ffe6 100644 --- a/engine/common/system.c +++ b/engine/common/system.c @@ -62,7 +62,7 @@ Sys_DebugBreak void Sys_DebugBreak( void ) { #if XASH_LINUX || ( XASH_WIN32 && !XASH_64BIT ) -#if XASH_MSVC +#if _MSC_VER if( Sys_DebuggerPresent() ) _asm { int 3 } #elif XASH_X86 diff --git a/public/xash3d_mathlib.h b/public/xash3d_mathlib.h index 363090d2..4b6e9412 100644 --- a/public/xash3d_mathlib.h +++ b/public/xash3d_mathlib.h @@ -24,10 +24,6 @@ GNU General Public License for more details. #include "build.h" #include "com_model.h" -#ifdef XASH_MSVC -#pragma warning(disable : 4201) // nonstandard extension used -#endif - // euler angle order #define PITCH 0 #define YAW 1