From 2fb712af668706df54323d883bea50adce36b998 Mon Sep 17 00:00:00 2001 From: exstrim401 Date: Sun, 27 Nov 2022 16:48:27 +0300 Subject: [PATCH] Fix macOS build (#146) * Fix macOS build * Fix *BSD build * Add missing *BSD include --- appframework/sdlmgr.cpp | 4 ++-- appframework/wscript | 3 +++ common/freetype/config/ftconfig.h | 2 +- dedicated/filesystem.cpp | 4 ++++ dedicated/sys_linux.cpp | 4 ++++ dedicated_main/main.cpp | 4 ++-- engine/bugreporter.cpp | 10 +++++----- engine/sv_main.cpp | 2 +- engine/sv_uploadgamestats.cpp | 4 ++-- engine/sys_dll.cpp | 6 +++--- engine/sys_dll2.cpp | 11 ++++++----- engine/sys_mainwind.cpp | 4 ++-- engine/wscript | 14 +++++++------- filesystem/basefilesystem.cpp | 2 +- filesystem/filesystem_async.cpp | 2 +- filesystem/filesystem_stdio.cpp | 6 +++--- gameui/BasePanel.cpp | 2 +- ivp | 2 +- launcher/launcher.cpp | 12 ++++++------ launcher/wscript | 2 -- mathlib/mathlib_base.cpp | 2 +- public/appframework/AppFramework.h | 2 +- public/appframework/ilaunchermgr.h | 2 +- public/libpng/pngconf.h | 2 +- public/tier0/platform.h | 10 +++++----- public/tier0/threadtools.h | 4 ++-- public/tier1/interface.h | 2 +- serverbrowser/ServerBrowserDialog.cpp | 2 +- tier0/cpu.cpp | 12 ++++++------ tier0/cpu_posix.cpp | 4 ++-- tier0/platform_posix.cpp | 16 ++++++++-------- tier0/threadtools.cpp | 4 ++-- tier1/strtools.cpp | 2 +- togl/linuxwin/dxabstract.cpp | 2 +- togl/linuxwin/glentrypoints.cpp | 4 ++-- togles/linuxwin/dxabstract.cpp | 2 +- togles/linuxwin/glentrypoints.cpp | 2 +- vgui2/src/system_posix.cpp | 6 +++--- vgui2/vgui_surfacelib/FontManager.cpp | 4 ++-- vguimatsurface/FontTextureCache.cpp | 2 +- vguimatsurface/MatSystemSurface.cpp | 8 ++++---- vguimatsurface/MatSystemSurface.h | 2 +- video/videoservices.cpp | 6 +++--- vstdlib/wscript | 1 - wscript | 2 +- 45 files changed, 107 insertions(+), 98 deletions(-) diff --git a/appframework/sdlmgr.cpp b/appframework/sdlmgr.cpp index 84de467c..bad06f1b 100644 --- a/appframework/sdlmgr.cpp +++ b/appframework/sdlmgr.cpp @@ -270,7 +270,7 @@ public: // Get the next N events. The function returns the number of events that were filled into your array. virtual int GetEvents( CCocoaEvent *pEvents, int nMaxEventsToReturn, bool debugEvents = false ); -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) virtual int PeekAndRemoveKeyboardEvents( bool *pbEsc, bool *pbReturn, bool *pbSpace, bool debugEvent = false ); #endif @@ -1004,7 +1004,7 @@ int CSDLMgr::GetEvents( CCocoaEvent *pEvents, int nMaxEventsToReturn, bool debug return nToWrite; } -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) int CSDLMgr::PeekAndRemoveKeyboardEvents( bool *pbEsc, bool *pbReturn, bool *pbSpace, bool debugEvent ) { diff --git a/appframework/wscript b/appframework/wscript index f8a11243..0fea261a 100755 --- a/appframework/wscript +++ b/appframework/wscript @@ -51,6 +51,9 @@ def build(bld): libs = [] + if bld.env.DEST_OS == 'darwin': + libs += ['FOUNDATION', 'APPKIT', 'IOKIT'] + bld.stlib( source = source, target = PROJECT_NAME, diff --git a/common/freetype/config/ftconfig.h b/common/freetype/config/ftconfig.h index f83aa8db..b56a4d44 100644 --- a/common/freetype/config/ftconfig.h +++ b/common/freetype/config/ftconfig.h @@ -3,7 +3,7 @@ #ifdef ANDROID #include -#elif defined(OSX) || defined(BSD) +#elif defined(OSX) || defined(PLATFORM_BSD) #include #else #include diff --git a/dedicated/filesystem.cpp b/dedicated/filesystem.cpp index 6d908a6b..7fc93d6c 100644 --- a/dedicated/filesystem.cpp +++ b/dedicated/filesystem.cpp @@ -13,7 +13,11 @@ #include #include "interface.h" #include +#ifdef OSX +#include +#else #include +#endif #include "tier1/strtools.h" #include "tier0/icommandline.h" #include "tier0/dbg.h" diff --git a/dedicated/sys_linux.cpp b/dedicated/sys_linux.cpp index 28e9b6c4..3cb9ebad 100644 --- a/dedicated/sys_linux.cpp +++ b/dedicated/sys_linux.cpp @@ -12,7 +12,11 @@ #include #include #include +#ifdef OSX +#include +#else #include +#endif #include #include #include diff --git a/dedicated_main/main.cpp b/dedicated_main/main.cpp index de75a373..418c857c 100644 --- a/dedicated_main/main.cpp +++ b/dedicated_main/main.cpp @@ -206,11 +206,11 @@ int main( int argc, char *argv[] ) void *tier0 = dlopen( "libtier0" DLL_EXT_STRING, RTLD_NOW ); void *vstdlib = dlopen( "libvstdlib" DLL_EXT_STRING, RTLD_NOW ); - const char *pBinaryName = "dedicated" DLL_EXT_STRING; + const char *pBinaryName = "bin/dedicated" DLL_EXT_STRING; void *dedicated = dlopen( pBinaryName, RTLD_NOW ); if ( !dedicated ) - dedicated = dlopen( "libdedicated" DLL_EXT_STRING, RTLD_NOW ); + dedicated = dlopen( "bin/libdedicated" DLL_EXT_STRING, RTLD_NOW ); if ( !dedicated ) { diff --git a/engine/bugreporter.cpp b/engine/bugreporter.cpp index 1caf4fcf..a0fbb4b8 100644 --- a/engine/bugreporter.cpp +++ b/engine/bugreporter.cpp @@ -20,7 +20,7 @@ #include #import #import -#elif defined(BSD) +#elif defined(PLATFORM_BSD) # include # include # include @@ -110,7 +110,7 @@ #define BUG_REPOSITORY_URL "\\\\fileserver\\bugs" #elif defined(OSX) #define BUG_REPOSITORY_URL "/Volumes/bugs" -#elif defined(LINUX) || defined(BSD) +#elif defined(LINUX) || defined(PLATFORM_BSD) #define BUG_REPOSITORY_URL "\\\\fileserver\\bugs" #else //#error @@ -144,7 +144,7 @@ unsigned long GetRam() MEMORYSTATUS stat; GlobalMemoryStatus( &stat ); return (stat.dwTotalPhys / (1024 * 1024)); -#elif defined(OSX) || defined(BSD) +#elif defined(OSX) || defined(PLATFORM_BSD) int mib[2] = { CTL_HW, HW_MEMSIZE }; u_int namelen = sizeof(mib) / sizeof(mib[0]); uint64_t memsize; @@ -345,7 +345,7 @@ void DisplaySystemVersion( char *osversion, int maxlen ) fclose( fpKernelVer ); } -#elif BSD +#elif PLATFORM_BSD #ifdef __FreeBSD__ osversion = (char *)"FreeBSD"; #else @@ -2257,7 +2257,7 @@ void NonFileSystem_CreatePath (const char *path) } } -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) #define COPYFILE_ALL 0 #define BSIZE 65535 int copyfile( const char *local, const char *remote, void *ignored, int ignoredFlags ) diff --git a/engine/sv_main.cpp b/engine/sv_main.cpp index 000da522..1456e44d 100644 --- a/engine/sv_main.cpp +++ b/engine/sv_main.cpp @@ -2714,7 +2714,7 @@ bool CGameServer::SpawnServer( const char *szMapName, const char *szMapFile, con event->SetString( "os", "LINUX" ); #elif defined ( OSX ) event->SetString( "os", "OSX" ); -#elif defined(BSD) +#elif defined(PLATFORM_BSD) event->SetString("os", # ifdef __FreeBSD__ "FreeBSD" diff --git a/engine/sv_uploadgamestats.cpp b/engine/sv_uploadgamestats.cpp index 01c110bf..c4a30859 100644 --- a/engine/sv_uploadgamestats.cpp +++ b/engine/sv_uploadgamestats.cpp @@ -23,7 +23,7 @@ //$ #include #ifdef OSX #include -#elif defined(BSD) +#elif defined(PLATFORM_BSD) #include #else typedef unsigned char uuid_t[16]; @@ -398,7 +398,7 @@ public: uuid_t newId; #ifdef OSX uuid_generate( newId ); -#elif defined(BSD) +#elif defined(PLATFORM_BSD) uint32_t status; uuid_create( &newId, &status ); #endif diff --git a/engine/sys_dll.cpp b/engine/sys_dll.cpp index 04ff6689..c30e0122 100644 --- a/engine/sys_dll.cpp +++ b/engine/sys_dll.cpp @@ -12,7 +12,7 @@ #elif defined(OSX) #include #include -#elif defined(BSD) +#elif defined(PLATFORM_BSD) #include #include #define HW_MEMSIZE HW_PHYSMEM @@ -668,7 +668,7 @@ void Sys_InitMemory( void ) #elif defined(POSIX) uint64_t memsize = ONE_HUNDRED_TWENTY_EIGHT_MB; -#if defined(OSX) || defined(BSD) +#if defined(OSX) || defined(PLATFORM_BSD) int mib[2] = { CTL_HW, HW_MEMSIZE }; u_int namelen = sizeof(mib) / sizeof(mib[0]); size_t len = sizeof(memsize); @@ -1586,7 +1586,7 @@ CON_COMMAND( star_memory, "Dump memory stats" ) struct mstats memstats = mstats( ); Msg( "Available %.2f MB, Used: %.2f MB, #mallocs = %lu\n", memstats.bytes_free / ( 1024.0 * 1024.0), memstats.bytes_used / ( 1024.0 * 1024.0 ), memstats.chunks_used ); -#elif BSD +#elif PLATFORM_BSD # warning TODO: Implement memory stats (peace of sheet of course) #else // Win32 MEMORYSTATUS stat; diff --git a/engine/sys_dll2.cpp b/engine/sys_dll2.cpp index 0a65cbd0..10d0c0d5 100644 --- a/engine/sys_dll2.cpp +++ b/engine/sys_dll2.cpp @@ -15,7 +15,8 @@ #include #endif -#if defined( OSX ) || defined(BSD) +#if defined( OSX ) || defined(PLATFORM_BSD) +#include #include #endif @@ -278,7 +279,7 @@ static void posix_signal_handler( int i ) #define DO_TRY if ( sigsetjmp( g_mark, 1 ) == 0 ) #define DO_CATCH else -#if defined( OSX ) || defined(BSD) +#if defined( OSX ) || defined(PLATFORM_BSD) #define __sighandler_t sig_t #endif @@ -537,7 +538,7 @@ public: FreeLibrary( hInst ); } -#elif defined( OSX ) || defined(BSD) +#elif defined( OSX ) || defined(PLATFORM_BSD) static const struct { @@ -548,7 +549,7 @@ public: #define _XTAG( _x ) { _x, #_x } _XTAG( HW_PHYSMEM ), _XTAG( HW_USERMEM ), -#ifdef BSD +#ifdef PLATFORM_BSD _XTAG( HW_PHYSMEM ), _XTAG( HW_NCPU ), #else @@ -566,7 +567,7 @@ public: if ( sysctl( mib, Q_ARRAYSIZE( mib ), &val, &len, NULL, 0 ) == 0 ) { - CommentPrintf( " %s: %" PRIu64 "\n", s_ctl_names[ i ].name, val ); + CommentPrintf( " %s: %d\n", s_ctl_names[ i ].name, val ); } } diff --git a/engine/sys_mainwind.cpp b/engine/sys_mainwind.cpp index b8fc98d7..6003bf7c 100644 --- a/engine/sys_mainwind.cpp +++ b/engine/sys_mainwind.cpp @@ -25,7 +25,7 @@ #elif defined(_X360) // nothing to include for 360 #elif defined(OSX) -#elif defined(LINUX) || defined(BSD) +#elif defined(LINUX) || defined(PLATFORM_BSD) #include "tier0/dynfunction.h" #elif defined(_WIN32) #include "tier0/dynfunction.h" @@ -833,7 +833,7 @@ LRESULT CGame::WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) // return 0 if handled message, 1 if not return lRet; } -#elif defined(OSX) || defined(LINUX) || defined(_WIN32) || defined(BSD) +#elif defined(OSX) || defined(LINUX) || defined(_WIN32) || defined(PLATFORM_BSD) #else #error diff --git a/engine/wscript b/engine/wscript index 1c716860..6ef0bc77 100755 --- a/engine/wscript +++ b/engine/wscript @@ -212,12 +212,6 @@ def build(bld): if bld.env.DEST_OS != "darwin": source += ['audio/snd_dev_sdl.cpp'] - if bld.env.DEST_OS == 'darwin': - source += [ - 'audio/snd_dev_openal.cpp', # [$OSXALL] - 'audio/snd_dev_mac_audioqueue.cpp',# [$OSXALL] - 'audio/voice_record_mac_audioqueue.cpp', #[$OSXALL] - ] if bld.env.DEST_OS == 'win32': source += [ @@ -343,6 +337,12 @@ def build(bld): 'audio/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL] 'audio/voice_record_openal.cpp' #[$OSXALL||$LINUXALL] ] + if bld.env.DEST_OS == 'darwin': + source += [ + 'audio/snd_dev_openal.cpp', # [$OSXALL] + 'audio/snd_dev_mac_audioqueue.cpp',# [$OSXALL] + 'audio/voice_record_mac_audioqueue.cpp', #[$OSXALL] + ] includes = [ '.', @@ -363,7 +363,7 @@ def build(bld): libs += ['SSL', 'CRYPTO'] # android curl was built with openssl elif bld.env.DEST_OS == 'win32': libs += ['USER32', 'WINMM', 'WININET', 'DSOUND', 'DXGUID', 'GDI32', 'bzip2'] - elif bld.env.DEST_OS == 'darwin': + elif bld.env.DEST_OS == 'darwin' and not bld.env.DEDICATED: libs += ['APPKIT', 'COREAUDIO', 'AUDIOTOOLBOX', 'SYSTEMCONFIGURATION'] install_path = bld.env.LIBDIR diff --git a/filesystem/basefilesystem.cpp b/filesystem/basefilesystem.cpp index 35f34f23..26bb8372 100644 --- a/filesystem/basefilesystem.cpp +++ b/filesystem/basefilesystem.cpp @@ -2841,7 +2841,7 @@ time_t CBaseFileSystem::FastFileTime( const CSearchPath *path, const char *pFile { return buf.st_mtime; } -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) char caseFixedName[ MAX_PATH ]; bool found = findFileInDirCaseInsensitive_safe( pTmpFileName, caseFixedName ); if ( found && FS_stat( caseFixedName, &buf ) != -1 ) diff --git a/filesystem/filesystem_async.cpp b/filesystem/filesystem_async.cpp index 27216b74..769ed017 100644 --- a/filesystem/filesystem_async.cpp +++ b/filesystem/filesystem_async.cpp @@ -1527,7 +1527,7 @@ void CBaseFileSystem::DoAsyncCallback( const FileAsyncRequest_t &request, void * if ( pDataToFree ) { Assert( !request.pfnAlloc ); -#if defined( OSX ) || defined( LINUX ) || defined(BSD) +#if defined( OSX ) || defined( LINUX ) || defined(PLATFORM_BSD) // The ugly delete[] (void*) method generates a compile warning on osx, as it should. free( pDataToFree ); #else diff --git a/filesystem/filesystem_stdio.cpp b/filesystem/filesystem_stdio.cpp index dcb9ad9d..f80d4e4a 100644 --- a/filesystem/filesystem_stdio.cpp +++ b/filesystem/filesystem_stdio.cpp @@ -579,7 +579,7 @@ int CFileSystem_Stdio::FS_chmod( const char *pathT, int pmode ) CBaseFileSystem::FixUpPath ( pathT, path, sizeof( path ) ); int rt = _chmod( path, pmode ); -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) if (rt==-1) { char caseFixedName[ MAX_PATH ]; @@ -707,7 +707,7 @@ int CFileSystem_Stdio::FS_stat( const char *pathT, struct _stat *buf, bool *pbLo } #endif // defined(_WIN32) && defined(FILESYSTEM_MSVC2015_STAT_BUG_WORKAROUND) -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) if ( rt == -1 ) { char caseFixedName[ MAX_PATH ]; @@ -866,7 +866,7 @@ CStdioFile *CStdioFile::FS_fopen( const char *filenameT, const char *options, in } } -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) if(!pFile && !strchr(options,'w') && !strchr(options,'+') ) // try opening the lower cased version { char caseFixedName[ MAX_PATH ]; diff --git a/gameui/BasePanel.cpp b/gameui/BasePanel.cpp index a79e9d70..c6e4051e 100644 --- a/gameui/BasePanel.cpp +++ b/gameui/BasePanel.cpp @@ -2220,7 +2220,7 @@ void CBasePanel::RunMenuCommand(const char *command) RegCloseKey(hKey); } -#elif defined( OSX ) || defined( LINUX ) || defined(BSD) +#elif defined( OSX ) || defined( LINUX ) || defined(PLATFORM_BSD) FILE *fp = fopen( "/tmp/hl2_relaunch", "w+" ); if ( fp ) { diff --git a/ivp b/ivp index 2306a253..0fcf14da 160000 --- a/ivp +++ b/ivp @@ -1 +1 @@ -Subproject commit 2306a2531691b46f739cb0b587c1f3527c7b1c11 +Subproject commit 0fcf14dafb1249bfed8fc951c81e3f77bf4e97fd diff --git a/launcher/launcher.cpp b/launcher/launcher.cpp index a5314c5b..b5f4f882 100644 --- a/launcher/launcher.cpp +++ b/launcher/launcher.cpp @@ -205,7 +205,7 @@ class CVCRHelpers : public IVCRHelpers public: virtual void ErrorMessage( const char *pMsg ) { -#if defined( WIN32 ) || defined( LINUX ) || defined(BSD) +#if defined( WIN32 ) || defined( LINUX ) || defined(PLATFORM_BSD) NOVCR( ::MessageBox( NULL, pMsg, "VCR Error", MB_OK ) ); #endif } @@ -950,7 +950,7 @@ bool GrabSourceMutex() #ifdef ANDROID return true; -#elif defined (LINUX) || defined(BSD) +#elif defined (LINUX) || defined(PLATFORM_BSD) /* * Linux */ @@ -1198,7 +1198,7 @@ DLL_EXPORT int LauncherMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR DLL_EXPORT int LauncherMain( int argc, char **argv ) #endif { -#if (defined(LINUX) || defined(BSD)) && !defined ANDROID +#if (defined(LINUX) || defined(PLATFORM_BSD)) && !defined ANDROID // Temporary fix to stop us from crashing in printf/sscanf functions that don't expect // localization to mess with your "." and "," float seperators. Mac OSX also sets LANG // to en_US.UTF-8 before starting up (in info.plist I believe). @@ -1225,7 +1225,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv ) Msg("SDL version: %d.%d.%d rev: %s\n", (int)ver.major, (int)ver.minor, (int)ver.patch, SDL_GetRevision()); #endif -#if (defined LINUX || defined BSD) && defined USE_SDL && defined TOGLES && !defined ANDROID +#if (defined LINUX || defined PLATFORM_BSD) && defined USE_SDL && defined TOGLES && !defined ANDROID SDL_SetHint(SDL_HINT_VIDEO_X11_FORCE_EGL, "1"); #endif @@ -1553,7 +1553,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv ) RegCloseKey(hKey); } -#elif defined( OSX ) || defined( LINUX ) || defined(BSD) +#elif defined( OSX ) || defined( LINUX ) || defined(PLATFORM_BSD) struct stat st; if ( stat( RELAUNCH_FILE, &st ) == 0 ) { @@ -1570,7 +1570,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv ) } szCmd[nChars] = 0; char szOpenLine[ MAX_PATH ]; - #if defined( LINUX ) || defined(BSD) + #if defined( LINUX ) || defined(PLATFORM_BSD) Q_snprintf( szOpenLine, sizeof(szOpenLine), "xdg-open \"%s\"", szCmd ); #else Q_snprintf( szOpenLine, sizeof(szOpenLine), "open \"%s\"", szCmd ); diff --git a/launcher/wscript b/launcher/wscript index 84292b63..8bd7dad3 100755 --- a/launcher/wscript +++ b/launcher/wscript @@ -45,8 +45,6 @@ def build(bld): if bld.env.DEST_OS == 'win32': libs += ['USER32', 'OLE32', 'SHELL32'] - elif bld.env.DEST_OS == 'darwin': - libs += ['FOUNDATION', 'APPKIT', 'IOKIT'] install_path = bld.env.LIBDIR diff --git a/mathlib/mathlib_base.cpp b/mathlib/mathlib_base.cpp index d8901a05..3b8fbe2f 100644 --- a/mathlib/mathlib_base.cpp +++ b/mathlib/mathlib_base.cpp @@ -3343,7 +3343,7 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright // SSE Generally performs better than 3DNow when present, so this is placed // first to allow SSE to override these settings. -#if !defined( OSX ) && !defined( PLATFORM_WINDOWS_PC64 ) && !defined(LINUX) && !defined(BSD) +#if !defined( OSX ) && !defined( PLATFORM_WINDOWS_PC64 ) && !defined(LINUX) && !defined(PLATFORM_BSD) if ( bAllow3DNow && pi.m_b3DNow ) { s_b3DNowEnabled = true; diff --git a/public/appframework/AppFramework.h b/public/appframework/AppFramework.h index 849ac8e6..4df8a2b8 100644 --- a/public/appframework/AppFramework.h +++ b/public/appframework/AppFramework.h @@ -61,7 +61,7 @@ void AppShutdown( CAppSystemGroup *pAppSystemGroup ); extern int ValveCocoaMain( int argc, char **argv, CAppSystemGroup *pAppSystemGroup ); \ return ValveCocoaMain( argc, argv, &_globalVarName ); \ } -#elif defined( LINUX ) || defined(BSD) +#elif defined( LINUX ) || defined(PLATFORM_BSD) #define DEFINE_WINDOWED_APPLICATION_OBJECT_GLOBALVAR( _globalVarName ) \ int main( int argc, char **argv ) \ { \ diff --git a/public/appframework/ilaunchermgr.h b/public/appframework/ilaunchermgr.h index e65ece3d..b7011ca1 100644 --- a/public/appframework/ilaunchermgr.h +++ b/public/appframework/ilaunchermgr.h @@ -52,7 +52,7 @@ public: // Get the next N events. The function returns the number of events that were filled into your array. virtual int GetEvents( CCocoaEvent *pEvents, int nMaxEventsToReturn, bool debugEvents = false ) = 0; -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) virtual int PeekAndRemoveKeyboardEvents( bool *pbEsc, bool *pbReturn, bool *pbSpace, bool debugEvents = false ) = 0; #endif diff --git a/public/libpng/pngconf.h b/public/libpng/pngconf.h index 3f188f79..57699a56 100644 --- a/public/libpng/pngconf.h +++ b/public/libpng/pngconf.h @@ -36,7 +36,7 @@ * because this file defines png_memcpy and so on the base APIs must * be defined here. */ -# ifdef BSD +# ifdef PLATFORM_BSD # include # else # include diff --git a/public/tier0/platform.h b/public/tier0/platform.h index 03197725..2c912e04 100644 --- a/public/tier0/platform.h +++ b/public/tier0/platform.h @@ -64,7 +64,7 @@ #ifdef POSIX // need this for _alloca -# ifdef BSD +# ifdef PLATFORM_BSD # define va_list __va_list # else # include @@ -162,7 +162,7 @@ #define IsOSX() false #endif - #ifdef BSD + #ifdef PLATFORM_BSD #define IsBSD() true #else #define IsBSD() false @@ -450,7 +450,7 @@ typedef void * HINSTANCE; #else // On OSX, SIGTRAP doesn't really stop the thread cold when debugging. // So if being debugged, use INT3 which is precise. -#if defined(OSX) || defined(BSD) +#if defined(OSX) || defined(PLATFORM_BSD) # if defined(__arm__) || defined(__aarch64__) # ifdef __clang__ # define DebuggerBreak() do { if ( Plat_IsInDebugSession() ) { __builtin_debugtrap(); } else { raise(SIGTRAP); } } while(0) @@ -561,7 +561,7 @@ typedef void * HINSTANCE; //----------------------------------------------------------------------------- #if defined( GNUC ) #define stackalloc( _size ) alloca( ALIGN_VALUE( _size, 16 ) ) -#if defined(_LINUX) || defined(BSD) +#if defined(_LINUX) || defined(PLATFORM_BSD) #define mallocsize( _p ) ( malloc_usable_size( _p ) ) #elif defined(OSX) #define mallocsize( _p ) ( malloc_size( _p ) ) @@ -1388,7 +1388,7 @@ PLATFORM_INTERFACE void* Plat_SimpleLog( const tchar* file, int line ); //----------------------------------------------------------------------------- // Returns true if debugger attached, false otherwise //----------------------------------------------------------------------------- -#if defined(_WIN32) || defined(LINUX) || defined(OSX) || defined(BSD) +#if defined(_WIN32) || defined(LINUX) || defined(OSX) || defined(PLATFORM_BSD) PLATFORM_INTERFACE bool Plat_IsInDebugSession(); PLATFORM_INTERFACE void Plat_DebugString( const char * ); #else diff --git a/public/tier0/threadtools.h b/public/tier0/threadtools.h index 6dff8b43..2b18dda7 100644 --- a/public/tier0/threadtools.h +++ b/public/tier0/threadtools.h @@ -285,7 +285,7 @@ PLATFORM_INTERFACE void ThreadSetAffinity( ThreadHandle_t hThread, int nAffinity #error Every platform needs to define ThreadMemoryBarrier to at least prevent compiler reordering #endif -#if defined( _LINUX ) || defined( _OSX ) || defined(BSD) +#if defined( _LINUX ) || defined( _OSX ) || defined(PLATFORM_BSD) #define USE_INTRINSIC_INTERLOCKED // linux implementation inline int32 ThreadInterlockedIncrement( int32 volatile *p ) @@ -486,7 +486,7 @@ PLATFORM_INTERFACE void ThreadNotifySyncReleasing(void *p); #ifndef NO_THREAD_LOCAL -#if defined(WIN32) || defined(OSX) || defined( _PS3 ) || ( defined (_LINUX) ) || defined(BSD) +#if defined(WIN32) || defined(OSX) || defined( _PS3 ) || ( defined (_LINUX) ) || defined(PLATFORM_BSD) #ifndef __AFXTLS_H__ // not compatible with some Windows headers #if defined(_PS3) diff --git a/public/tier1/interface.h b/public/tier1/interface.h index 09b24caf..6aff675b 100644 --- a/public/tier1/interface.h +++ b/public/tier1/interface.h @@ -36,7 +36,7 @@ #pragma once #endif -#if defined(_LINUX) || defined(BSD) +#if defined(_LINUX) || defined(PLATFORM_BSD) #include // dlopen,dlclose, et al #include diff --git a/serverbrowser/ServerBrowserDialog.cpp b/serverbrowser/ServerBrowserDialog.cpp index b13f9cd8..dc2ca162 100644 --- a/serverbrowser/ServerBrowserDialog.cpp +++ b/serverbrowser/ServerBrowserDialog.cpp @@ -25,7 +25,7 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) #include #endif diff --git a/tier0/cpu.cpp b/tier0/cpu.cpp index f997ffb0..0a1d84be 100644 --- a/tier0/cpu.cpp +++ b/tier0/cpu.cpp @@ -11,7 +11,7 @@ #include #elif defined(_LINUX) #include -#elif defined(OSX) || defined(BSD) +#elif defined(OSX) || defined(PLATFORM_BSD) #include #endif @@ -273,7 +273,7 @@ bool CheckSSE4aTechnology( void ) static bool Check3DNowTechnology(void) { -#if defined( _X360 ) || defined( _PS3 ) || defined (__arm__) || defined(__SANITIZE_ADDRESS__) || (defined(BSD) && defined(COMPILER_CLANG)) +#if defined( _X360 ) || defined( _PS3 ) || defined (__arm__) || defined(__SANITIZE_ADDRESS__) || (defined(PLATFORM_BSD) && defined(COMPILER_CLANG)) return false; #else uint32 eax, unused; @@ -479,14 +479,14 @@ static int64 CalculateClockSpeed() } return freq; #endif -#elif defined(BSD) +#elif defined(PLATFORM_BSD) return CalculateCPUFreq() * 1000000.0f; #elif defined(POSIX) int64 freq =(int64)CalculateCPUFreq(); - if ( freq == 0 ) // couldn't calculate clock speed + /*if ( freq == 0 ) // couldn't calculate clock speed { Warning( "Unable to determine CPU Frequency\n" ); - } + }*/ return freq; #endif } @@ -584,7 +584,7 @@ const CPUInformation* GetCPUInformation() pi.m_nLogicalProcessors = 1; Assert( !"couldn't read cpu information from /proc/cpuinfo" ); } -#elif defined(OSX) || defined(BSD) +#elif defined(OSX) || defined(PLATFORM_BSD) int mib[2], num_cpu = 1; size_t len; mib[0] = CTL_HW; diff --git a/tier0/cpu_posix.cpp b/tier0/cpu_posix.cpp index f47444fb..a86f40a7 100644 --- a/tier0/cpu_posix.cpp +++ b/tier0/cpu_posix.cpp @@ -51,7 +51,7 @@ static inline uint64 diff(uint64 v1, uint64 v2) return -d; } -#if defined(OSX) || defined(BSD) +#if defined(OSX) || defined(PLATFORM_BSD) // Mac or BSD uint64 GetCPUFreqFromPROC() @@ -101,7 +101,7 @@ uint64 GetCPUFreqFromPROC() uint64 CalculateCPUFreq() { -#if defined(__APPLE__) || defined(BSD) +#if defined(__APPLE__) || defined(PLATFORM_BSD) return GetCPUFreqFromPROC(); #else // Try to open cpuinfo_max_freq. If the kernel was built with cpu scaling support disabled, this will fail. diff --git a/tier0/platform_posix.cpp b/tier0/platform_posix.cpp index ee930b90..425f8cff 100644 --- a/tier0/platform_posix.cpp +++ b/tier0/platform_posix.cpp @@ -16,8 +16,8 @@ #include #include -#if defined(OSX) || defined(BSD) -# ifdef BSD +#if defined(OSX) || defined(PLATFORM_BSD) +# ifdef PLATFORM_BSD # include # include # else @@ -441,7 +441,7 @@ PLATFORM_INTERFACE void Plat_SetAllocErrorFn( Plat_AllocErrorFn fn ) #endif // !NO_HOOK_MALLOC -#if defined( OSX ) || defined(BSD) +#if defined( OSX ) || defined(PLATFORM_BSD) // From the Apple tech note: http://developer.apple.com/library/mac/#qa/qa1361/_index.html bool Plat_IsInDebugSession() @@ -451,7 +451,7 @@ bool Plat_IsInDebugSession() struct kinfo_proc info; size_t size; int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()}; -#ifndef BSD +#ifndef PLATFORM_BSD info.kp_proc.p_flag = 0; #endif @@ -459,7 +459,7 @@ bool Plat_IsInDebugSession() junk = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0); // We're being debugged if the P_TRACED flag is set. -#ifdef BSD +#ifdef PLATFORM_BSD s_IsInDebugSession = info.ki_flag & P_TRACED; #else s_IsInDebugSession = info.kp_proc.p_flag & P_TRACED; @@ -559,7 +559,7 @@ PLATFORM_INTERFACE const char *Plat_GetCommandLineA() PLATFORM_INTERFACE bool GetMemoryInformation( MemoryInformation *pOutMemoryInfo ) { - #if defined( LINUX ) || defined( OSX ) || defined(BSD) + #if defined( LINUX ) || defined( OSX ) || defined(PLATFORM_BSD) return false; #else #error "Need to fill out GetMemoryInformation or at least return false for this platform" @@ -571,7 +571,7 @@ PLATFORM_INTERFACE bool Is64BitOS() { #if defined OSX return true; -#elif defined(LINUX) || defined(BSD) +#elif defined(LINUX) || defined(PLATFORM_BSD) FILE *pp = popen( "uname -m", "r" ); if ( pp != NULL ) { @@ -781,7 +781,7 @@ static void InstallHooks( void ) __realloc_hook = ReallocHook; } -#elif OSX || BSD +#elif OSX || PLATFORM_BSD static void RemoveHooks( void ) diff --git a/tier0/threadtools.cpp b/tier0/threadtools.cpp index 5ae40007..b0dbb645 100644 --- a/tier0/threadtools.cpp +++ b/tier0/threadtools.cpp @@ -43,7 +43,7 @@ #define OS_TO_PTHREAD(x) pthread_from_mach_thread_np( x ) #endif // !OSX -#ifdef BSD +#ifdef PLATFORM_BSD # undef OS_TO_PTRHEAD # define OS_TO_PTHREAD(x) (pthread_t)(x) #endif @@ -1685,7 +1685,7 @@ bool CThreadFullMutex::Release() // //----------------------------------------------------------------------------- -#if defined( WIN32 ) || defined( _PS3 ) || defined( _OSX ) || defined (_LINUX) || defined(BSD) +#if defined( WIN32 ) || defined( _PS3 ) || defined( _OSX ) || defined (_LINUX) || defined(PLATFORM_BSD) #if !defined(_PS3) namespace GenericThreadLocals { diff --git a/tier1/strtools.cpp b/tier1/strtools.cpp index e4d40fd3..ce1adb0c 100644 --- a/tier1/strtools.cpp +++ b/tier1/strtools.cpp @@ -2953,7 +2953,7 @@ extern "C" void qsort_s( void *base, size_t num, size_t width, int (*compare )(v void V_qsort_s( void *base, size_t num, size_t width, int ( __cdecl *compare )(void *, const void *, const void *), void * context ) { -#if defined(OSX) || defined(BSD) +#if defined(OSX) || defined(PLATFORM_BSD) // the arguments are swapped 'round on the mac - awesome, huh? return qsort_r( base, num, width, context, compare ); #else diff --git a/togl/linuxwin/dxabstract.cpp b/togl/linuxwin/dxabstract.cpp index b0f890db..45100948 100644 --- a/togl/linuxwin/dxabstract.cpp +++ b/togl/linuxwin/dxabstract.cpp @@ -38,7 +38,7 @@ #include "glmgr_flush.inl" -#if defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) || defined(BSD) +#if defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) || defined(PLATFORM_BSD) #include "appframework/ilaunchermgr.h" extern ILauncherMgr *g_pLauncherMgr; #endif diff --git a/togl/linuxwin/glentrypoints.cpp b/togl/linuxwin/glentrypoints.cpp index a2118f43..621ab394 100644 --- a/togl/linuxwin/glentrypoints.cpp +++ b/togl/linuxwin/glentrypoints.cpp @@ -43,7 +43,7 @@ #include "tier1.h" #include "tier2/tier2.h" -#if (defined(_LINUX) || defined(BSD)) && !defined(__ANDROID__) +#if (defined(_LINUX) || defined(PLATFORM_BSD)) && !defined(__ANDROID__) #include #endif @@ -54,7 +54,7 @@ #error #endif -#if defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) || defined(BSD) +#if defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) || defined(PLATFORM_BSD) #include "appframework/ilaunchermgr.h" ILauncherMgr *g_pLauncherMgr = NULL; #endif diff --git a/togles/linuxwin/dxabstract.cpp b/togles/linuxwin/dxabstract.cpp index a993c095..96a67093 100644 --- a/togles/linuxwin/dxabstract.cpp +++ b/togles/linuxwin/dxabstract.cpp @@ -38,7 +38,7 @@ #include "glmgr_flush.inl" -#if defined(BSD) || defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) +#if defined(PLATFORM_BSD) || defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) #include "appframework/ilaunchermgr.h" extern ILauncherMgr *g_pLauncherMgr; #endif diff --git a/togles/linuxwin/glentrypoints.cpp b/togles/linuxwin/glentrypoints.cpp index 6834696b..40bb4d31 100644 --- a/togles/linuxwin/glentrypoints.cpp +++ b/togles/linuxwin/glentrypoints.cpp @@ -54,7 +54,7 @@ #error #endif -#if defined(BSD) || defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) +#if defined(PLATFORM_BSD) || defined(OSX) || defined(LINUX) || (defined (WIN32) && defined( DX_TO_GL_ABSTRACTION )) #include "appframework/ilaunchermgr.h" ILauncherMgr *g_pLauncherMgr = NULL; #endif diff --git a/vgui2/src/system_posix.cpp b/vgui2/src/system_posix.cpp index f781805f..9473d416 100644 --- a/vgui2/src/system_posix.cpp +++ b/vgui2/src/system_posix.cpp @@ -28,7 +28,7 @@ #include "vgui_key_translation.h" #include "filesystem.h" -#if defined(OSX) || defined(BSD) +#if defined(OSX) || defined(PLATFORM_BSD) #include #include #elif defined(LINUX) @@ -292,7 +292,7 @@ void CSystem::ShellExecute(const char *command, const char *file) if ( pid == 0 ) { // Child -#if defined(LINUX) || defined(BSD) +#if defined(LINUX) || defined(PLATFORM_BSD) // Escape steam runtime if necessary const char *szSteamRuntime = getenv( "STEAM_RUNTIME" ); if ( szSteamRuntime ) @@ -587,7 +587,7 @@ int CSystem::GetAvailableDrives(char *buf, int bufLen) //----------------------------------------------------------------------------- double CSystem::GetFreeDiskSpace(const char *path) { -#if __DARWIN_ONLY_64_BIT_INO_T || BSD +#if __DARWIN_ONLY_64_BIT_INO_T || PLATFORM_BSD // MoeMod: newer macOS only support 64bit, so no statfs64 is provided struct statfs buf; int ret = statfs( path, &buf ); diff --git a/vgui2/vgui_surfacelib/FontManager.cpp b/vgui2/vgui_surfacelib/FontManager.cpp index 78671320..870113aa 100644 --- a/vgui2/vgui_surfacelib/FontManager.cpp +++ b/vgui2/vgui_surfacelib/FontManager.cpp @@ -584,7 +584,7 @@ FallbackFont_t g_FallbackFonts[] = { NULL, "Monaco" } // every other font falls back to this }; -#elif defined(LINUX) || defined(BSD) +#elif defined(LINUX) || defined(PLATFORM_BSD) static const char *g_szValidAsianFonts[] = { "Marlett", "WenQuanYi Zen Hei", "unifont", NULL }; // list of how fonts fallback @@ -649,7 +649,7 @@ const char *CFontManager::GetForeignFallbackFontName() return "Tahoma"; #elif defined(OSX) return "Helvetica"; -#elif defined(LINUX) || defined(BSD) +#elif defined(LINUX) || defined(PLATFORM_BSD) return "WenQuanYi Zen Hei"; #elif defined(_PS3) return "Tahoma"; diff --git a/vguimatsurface/FontTextureCache.cpp b/vguimatsurface/FontTextureCache.cpp index bed3726e..7703be73 100644 --- a/vguimatsurface/FontTextureCache.cpp +++ b/vguimatsurface/FontTextureCache.cpp @@ -10,7 +10,7 @@ #include #elif defined( OSX ) #include -#elif defined( LINUX ) || defined(BSD) +#elif defined( LINUX ) || defined(PLATFORM_BSD) //#error #elif defined( _X360 ) #else diff --git a/vguimatsurface/MatSystemSurface.cpp b/vguimatsurface/MatSystemSurface.cpp index feb15010..02f11001 100644 --- a/vguimatsurface/MatSystemSurface.cpp +++ b/vguimatsurface/MatSystemSurface.cpp @@ -146,7 +146,7 @@ CMatSystemSurface g_MatSystemSurface; EXPOSE_SINGLE_INTERFACE_GLOBALVAR( CMatSystemSurface, ISurface, VGUI_SURFACE_INTERFACE_VERSION, g_MatSystemSurface ); -#if defined(LINUX) || defined(OSX) || defined(BSD) +#if defined(LINUX) || defined(OSX) || defined(PLATFORM_BSD) CUtlDict< CMatSystemSurface::font_entry, unsigned short > CMatSystemSurface::m_FontData; #endif @@ -407,7 +407,7 @@ InitReturnVal_t CMatSystemSurface::Init( void ) FontManager().SetLanguage( "english" ); } -#if defined(LINUX) || defined(OSX) || defined(BSD) +#if defined(LINUX) || defined(OSX) || defined(PLATFORM_BSD) FontManager().SetFontDataHelper( &CMatSystemSurface::FontDataHelper ); #endif @@ -1907,7 +1907,7 @@ bool CMatSystemSurface::AddCustomFontFile( const char *fontName, const char *fon } Assert( success ); return success; -#elif defined(LINUX) || defined(OSX) || defined(BSD) +#elif defined(LINUX) || defined(OSX) || defined(PLATFORM_BSD) int size; if ( CMatSystemSurface::FontDataHelper( fontName, size, fontFileName ) ) @@ -1921,7 +1921,7 @@ bool CMatSystemSurface::AddCustomFontFile( const char *fontName, const char *fon #endif } -#if defined(LINUX) || defined(OSX) || defined(BSD) +#if defined(LINUX) || defined(OSX) || defined(PLATFORM_BSD) static void RemoveSpaces( CUtlString &str ) { diff --git a/vguimatsurface/MatSystemSurface.h b/vguimatsurface/MatSystemSurface.h index cbcc09d3..bc46b1fd 100644 --- a/vguimatsurface/MatSystemSurface.h +++ b/vguimatsurface/MatSystemSurface.h @@ -556,7 +556,7 @@ private: int m_nFullscreenViewportHeight; ITexture *m_pFullscreenRenderTarget; -#if defined(LINUX) || defined(OSX) || defined(BSD) +#if defined(LINUX) || defined(OSX) || defined(PLATFORM_BSD) struct font_entry { void *data; diff --git a/video/videoservices.cpp b/video/videoservices.cpp index 27e913d1..58f1e8c6 100644 --- a/video/videoservices.cpp +++ b/video/videoservices.cpp @@ -58,14 +58,14 @@ DEFINE_ENUM_BITWISE_OPERATORS( EPlatform_t ); const EPlatform_t thisPlatform = PLATFORM_XBOX_360; #elif defined( _PS3 ) const EPlatform_t thisPlatform = PLATFORM_PS3; -#elif defined ( _LINUX ) || defined(BSD) +#elif defined ( _LINUX ) || defined(PLATFORM_BSD) const EPlatform_t thisPlatform = PLATFORM_LINUX; #else #error "UNABLE TO DETERMINE PLATFORM" #endif -#if defined( OSX ) || defined( LINUX ) || defined(BSD) +#if defined( OSX ) || defined( LINUX ) || defined(PLATFORM_BSD) ILauncherMgr *g_pLauncherMgr = NULL; #endif @@ -1382,7 +1382,7 @@ bool CVideoCommonServices::ProcessFullScreenInput( bool &bAbortEvent, bool &bPau bool bEscPressed = ( m_bScanEsc ) ? CGEventSourceKeyState( kCGEventSourceStateCombinedSessionState, kVK_Escape ) : false; bool bReturnPressed = ( m_bScanReturn ) ? CGEventSourceKeyState( kCGEventSourceStateCombinedSessionState, kVK_Return ) : false; bool bSpacePressed = ( m_bScanSpace ) ? CGEventSourceKeyState( kCGEventSourceStateCombinedSessionState, kVK_Space ) : false; -#elif defined(LINUX) || defined(BSD) +#elif defined(LINUX) || defined(PLATFORM_BSD) g_pLauncherMgr->PumpWindowsMessageLoop(); // Escape, return, or space stops or pauses the playback diff --git a/vstdlib/wscript b/vstdlib/wscript index ebb1290e..f989fa18 100755 --- a/vstdlib/wscript +++ b/vstdlib/wscript @@ -53,7 +53,6 @@ def build(bld): if bld.env.DEST_OS == 'android': libs += ['ANDROID_SUPPORT'] elif bld.env.DEST_OS == 'darwin': - libs += ['ICONV', 'COREFOUNDATION'] linkflags += ['-framework', 'CoreServices'] install_path = bld.env.LIBDIR diff --git a/wscript b/wscript index b865a1c5..5c12bf40 100644 --- a/wscript +++ b/wscript @@ -225,7 +225,7 @@ def define_platform(conf): conf.env.append_unique('DEFINES', [ 'POSIX=1', '_POSIX=1', 'PLATFORM_POSIX=1', 'GNUC', # but uses clang - 'BSD=1', + 'PLATFORM_BSD=1', '_DLL_EXT=.so' ])