vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine, public: prepare to removal of XASH_MSVC macro

Browse source
This commit is contained in:
Alibek Omarov 2023-01-09 08:01:52 +03:00
parent c28aeb2362
commit 209a03a12a
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/common/lib_common.c
View file

@ -65,7 +65,7 @@ void *COM_FunctionFromName_SR( void *hInstance, const char *pName )
if( f ) return f; if( f ) return f;
} }
#elif XASH_MSVC #elif _MSC_VER
// TODO: COM_ConvertToLocalPlatform doesn't support MSVC yet // TODO: COM_ConvertToLocalPlatform doesn't support MSVC yet
// also custom loader strips always MSVC mangling, so Win32 // also custom loader strips always MSVC mangling, so Win32
// platforms already use platform-neutral names // 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 ) static void COM_GenerateCommonLibraryName( const char *name, const char *ext, char *out, size_t size )
{ {
#if ( XASH_WIN32 || XASH_LINUX || XASH_APPLE ) && XASH_X86 #if ( XASH_WIN32 || XASH_LINUX || XASH_APPLE ) && XASH_X86

2
engine/common/system.c
View file

@ -62,7 +62,7 @@ Sys_DebugBreak
void Sys_DebugBreak( void ) void Sys_DebugBreak( void )
{ {
#if XASH_LINUX || ( XASH_WIN32 && !XASH_64BIT ) #if XASH_LINUX || ( XASH_WIN32 && !XASH_64BIT )
#if XASH_MSVC #if _MSC_VER
if( Sys_DebuggerPresent() ) if( Sys_DebuggerPresent() )
_asm { int 3 } _asm { int 3 }
#elif XASH_X86 #elif XASH_X86

4
public/xash3d_mathlib.h
View file

@ -24,10 +24,6 @@ GNU General Public License for more details.
#include "build.h" #include "build.h"
#include "com_model.h" #include "com_model.h"
#ifdef XASH_MSVC
#pragma warning(disable : 4201) // nonstandard extension used
#endif
// euler angle order // euler angle order
#define PITCH 0 #define PITCH 0
#define YAW 1 #define YAW 1