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

Rename lib/sysdep/os/osx to macos

Browse source 
Rename the directory and the osx-prefixed files in it to match the
modern platform name, and update the include guards and the references
in source, premake and the cppcheck suppressions.

Refs #7546

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
josue 2026-06-12 09:19:59 +02:00
parent 53c5ad2548
commit 78f2f6d617
17 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/premake/premake5.lua
View file

@ -1023,7 +1023,7 @@ function setup_all_libs ()
-- note: RC file must be added to main_exe project.
-- note: don't add "lib/sysdep/os/win/aken.cpp" because that must be compiled with the DDK.
windows = { "lib/sysdep/os/win", "lib/sysdep/os/win/wposix", "lib/sysdep/os/win/whrt" },
macosx = { "lib/sysdep/os/osx", "lib/sysdep/os/unix" },
macosx = { "lib/sysdep/os/macos", "lib/sysdep/os/unix" },
bsd = { "lib/sysdep/os/bsd", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" },
}
for i,v in pairs(sysdep_dirs[os.target()]) do

4
source/lib/sysdep/os/osx/dir_watch.cpp → source/lib/sysdep/os/macos/dir_watch.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -24,7 +24,7 @@
#include "lib/sysdep/dir_watch.h"
#include "lib/file/file_system.h"
#include "osx_sys_version.h"
#include "macos_sys_version.h"
#include "lib/os_path.h"
#include "lib/file/file.h"

4
source/lib/sysdep/os/osx/osx.cpp → source/lib/sysdep/os/macos/macos.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -25,7 +25,7 @@
#include "lib/lib.h"
#include "lib/sysdep/sysdep.h"
#include "lib/utf8.h"
#include "osx_bundle.h"
#include "macos_bundle.h"
#include <ApplicationServices/ApplicationServices.h>
#include <AvailabilityMacros.h> // MAC_OS_X_VERSION_MIN_REQUIRED

8
source/lib/sysdep/os/osx/osx_atlas.h → source/lib/sysdep/os/macos/macos_atlas.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -20,8 +20,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef OSX_ATLAS_H
#define OSX_ATLAS_H
#ifndef MACOS_ATLAS_H
#define MACOS_ATLAS_H
#include <vector>
@ -33,4 +33,4 @@ class CStr8;
*/
void startNewAtlasProcess(const std::vector<CStr8>& mods);
#endif // OSX_ATLAS_H
#endif // MACOS_ATLAS_H

4
source/lib/sysdep/os/osx/osx_atlas.mm → source/lib/sysdep/os/macos/macos_atlas.mm
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -23,7 +23,7 @@
#import <AvailabilityMacros.h> // MAC_OS_X_VERSION_MIN_REQUIRED
#import <AppKit/AppKit.h>
#import "osx_atlas.h"
#import "macos_atlas.h"
#include "lib/types.h"
#include "ps/CStr.h"

8
source/lib/sysdep/os/osx/osx_bundle.h → source/lib/sysdep/os/macos/macos_bundle.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -20,8 +20,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef OSX_BUNDLE_H
#define OSX_BUNDLE_H
#ifndef MACOS_BUNDLE_H
#define MACOS_BUNDLE_H
/**
* @file
@ -60,4 +60,4 @@ std::string osx_GetBundleResourcesPath();
*/
std::string osx_GetBundleFrameworksPath();
#endif // OSX_BUNDLE_H
#endif // MACOS_BUNDLE_H

4
source/lib/sysdep/os/osx/osx_bundle.mm → source/lib/sysdep/os/macos/macos_bundle.mm
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -24,7 +24,7 @@
#import <Foundation/Foundation.h>
#import <string>
#import "osx_bundle.h"
#import "macos_bundle.h"
bool osx_IsAppBundleValid()
{

8
source/lib/sysdep/os/osx/osx_paths.h → source/lib/sysdep/os/macos/macos_paths.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -20,8 +20,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef OSX_PATHS_H
#define OSX_PATHS_H
#ifndef MACOS_PATHS_H
#define MACOS_PATHS_H
/**
* @file
@ -44,4 +44,4 @@ std::string osx_GetAppSupportPath();
*/
std::string osx_GetCachesPath();
#endif // OSX_PATHS_H
#endif // MACOS_PATHS_H

4
source/lib/sysdep/os/osx/osx_paths.mm → source/lib/sysdep/os/macos/macos_paths.mm
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -24,7 +24,7 @@
#import <Foundation/Foundation.h>
#import <string>
#import "osx_paths.h"
#import "macos_paths.h"
// Helper function
static std::string getUserDirectoryPath(NSSearchPathDirectory directory)

8
source/lib/sysdep/os/osx/osx_sys_version.h → source/lib/sysdep/os/macos/macos_sys_version.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -20,9 +20,9 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef OSX_SYS_VERSION_H
#define OSX_SYS_VERSION_H
#ifndef MACOS_SYS_VERSION_H
#define MACOS_SYS_VERSION_H
void GetSystemVersion( int &major, int &minor, int &bugfix );
#endif //OSX_SYS_VERSION_H
#endif //MACOS_SYS_VERSION_H

4
source/lib/sysdep/os/osx/osx_sys_version.mm → source/lib/sysdep/os/macos/macos_sys_version.mm
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -25,7 +25,7 @@
#import <dispatch/dispatch.h>
#import <string>
#import "osx_sys_version.h"
#import "macos_sys_version.h"
void GetSystemVersion(int &major, int &minor, int &bugfix)
{

2
source/lib/sysdep/os/osx/ocpu.cpp → source/lib/sysdep/os/macos/ocpu.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the

2
source/lib/sysdep/os/osx/odbg.cpp → source/lib/sysdep/os/macos/odbg.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the

2
source/main.cpp
View file

@ -114,7 +114,7 @@ that of Atlas depending on commandline parameters.
#endif // OS_UNIX
#if OS_MACOSX
#include "lib/sysdep/os/osx/osx_atlas.h"
#include "lib/sysdep/os/macos/macos_atlas.h"
#endif
#if MSC_VERSION

4
source/ps/DllLoader.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -30,7 +30,7 @@
#include <string>
#if OS_MACOSX
# include "lib/sysdep/os/osx/osx_bundle.h"
# include "lib/sysdep/os/macos/macos_bundle.h"
#endif
static void* const HANDLE_UNAVAILABLE = (void*)-1;

6
source/ps/GameSetup/Paths.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -37,8 +37,8 @@
#if OS_WIN
# include "lib/sysdep/os/win/wutil.h" // wutil_*Path
#elif OS_MACOSX
# include "lib/sysdep/os/osx/osx_paths.h"
# include "lib/sysdep/os/osx/osx_bundle.h"
# include "lib/sysdep/os/macos/macos_paths.h"
# include "lib/sysdep/os/macos/macos_bundle.h"
#endif

2
source/tools/lint/cppcheck/suppressions-list.txt
View file

@ -38,7 +38,7 @@ nullPointer:source/lib/tests/test_secure_crt.h
nullPointerArithmetic:source/lib/sysdep/os/win/wposix/wposix_internal.h
nullPointerArithmetic:source/lib/sysdep/os/win/wposix/wpthread.cpp
nullPointerOutOfMemory:source/lib/sysdep/os/osx/dir_watch.cpp
nullPointerOutOfMemory:source/lib/sysdep/os/macos/dir_watch.cpp
nullPointerOutOfMemory:source/lib/sysdep/smbios.cpp
nullPointerOutOfMemory:source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp