dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove OS_MAC macro

Browse source 
It hasn't been used in a while, and we shouldn't pretend to support macOS < 10.9.
This commit is contained in:
Stan 2025-07-19 11:28:53 +02:00
parent 6f2f8c13bf
commit 0d60ecbf96
No known key found for this signature in database
GPG key ID: 697155C99A989EC2
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/lib/ogl.cpp
View file

@ -34,7 +34,7 @@
# if OS_WIN
# include <glad/wgl.h>
# elif !OS_MACOSX && !OS_MAC
# elif !OS_MACOSX
# include <SDL_syswm.h>
# if defined(SDL_VIDEO_DRIVER_X11)
# include <glad/glx.h>
@ -220,7 +220,7 @@ bool ogl_HaveExtension(const char* ext)
static int GLVersion;
#if OS_WIN
static int WGLVersion;
#elif !CONFIG2_GLES && !OS_MACOSX && !OS_MAC
#elif !CONFIG2_GLES && !OS_MACOSX
#if defined(SDL_VIDEO_DRIVER_X11)
static int GLXVersion;
#endif
@ -428,7 +428,7 @@ bool ogl_SquelchError(GLenum err_to_ignore)
#if OS_WIN
bool ogl_Init(void* (load)(const char*), void* hdc)
#elif !CONFIG2_GLES && !OS_MACOSX && !OS_MAC
#elif !CONFIG2_GLES && !OS_MACOSX
bool ogl_Init(void* (load)(const char*), void* display, int subsystem)
#else
bool ogl_Init(void* (load)(const char*))
@ -458,7 +458,7 @@ bool ogl_Init(void* (load)(const char*))
LOAD_ERROR("Failed to load WGL functions.");
return false;
}
# elif !OS_MACOSX && !OS_MAC
# elif !OS_MACOSX
const SDL_SYSWM_TYPE sysWMType = static_cast<SDL_SYSWM_TYPE>(subsystem);
# if defined(SDL_VIDEO_DRIVER_X11)
if (sysWMType == SDL_SYSWM_X11)
@ -522,7 +522,7 @@ void ogl_SetVsyncEnabled(bool enabled)
#if !CONFIG2_GLES && OS_WIN
if (ogl_HaveExtension("WGL_EXT_swap_control"))
wglSwapIntervalEXT(interval);
#elif !CONFIG2_GLES && !OS_MACOSX && !OS_MAC
#elif !CONFIG2_GLES && !OS_MACOSX
#if defined(SDL_VIDEO_DRIVER_X11)
if (GLXVersion && ogl_HaveExtension("GLX_SGI_swap_control"))
glXSwapIntervalSGI(interval);

2
source/lib/ogl.h
View file

@ -46,7 +46,7 @@
**/
#if OS_WIN
extern bool ogl_Init(void* (load)(const char*), void* hdc);
#elif !OS_MACOSX && !OS_MAC && !CONFIG2_GLES
#elif !OS_MACOSX && !CONFIG2_GLES
extern bool ogl_Init(void* (load)(const char*), void* display, int subsystem);
#else
extern bool ogl_Init(void* (load)(const char*));

6
source/lib/sysdep/os.h
View file

@ -91,12 +91,6 @@
#else
# define OS_BEOS 0
#endif
// Mac OS 9 or below
#if defined(macintosh)
# define OS_MAC 1
#else
# define OS_MAC 0
#endif
// Amiga
#if defined(AMIGA)
# define OS_AMIGA 1

10
source/scriptinterface/tests/test_Module.h
View file

@ -29,13 +29,13 @@
#include "scriptinterface/ScriptContext.h"
#include "scriptinterface/ScriptInterface.h"
#if OS_MAC || OS_MACOSX
#if OS_MACOSX
#include <CoreFoundation/CoreFoundation.h>
#endif
#if OS_LINUX
#include <cstdlib>
#endif
#if OS_WIN || OS_WIN64 || OS_MAC || OS_MACOSX
#if OS_WIN || OS_WIN64 || OS_MACOSX
#include <filesystem>
#endif
#include <fstream>
@ -47,7 +47,7 @@ namespace
{
void ClearFromCache(const VfsPath& path)
{
#if OS_BSD && !(OS_MAC || OS_MACOSX)
#if OS_BSD && !OS_MACOSX
TS_SKIP("On BSD hotload isn't implemented.");
#endif
@ -57,7 +57,7 @@ void ClearFromCache(const VfsPath& path)
PDirWatch dirWatch;
dir_watch_Add((file.Parent() / "").string8(), dirWatch);
#if OS_WIN || OS_WIN64 || OS_MAC || OS_MACOSX
#if OS_WIN || OS_WIN64 || OS_MACOSX
std::filesystem::last_write_time(file.string8(), std::filesystem::file_time_type::clock::now());
#endif
@ -71,7 +71,7 @@ void ClearFromCache(const VfsPath& path)
while (status == INFO::SKIPPED)
{
status = ReloadChangedFiles();
#if OS_MAC || OS_MACOSX
#if OS_MACOSX
// Console apps don't have a run loop, so we need to wait
// a bit for the file watcher to catch up.
CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true);