macOS: rename most internal uses of "macosx" to "macos".

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2019-12-22 17:54:20 -04:00
parent a27781aa6a
commit bc12312f0f
15 changed files with 52 additions and 57 deletions
+3 -3
View File
@@ -45,7 +45,7 @@
# if TARGET_OS_IPHONE
# define LOVE_IOS 1
# elif TARGET_OS_MAC
# define LOVE_MACOSX 1
# define LOVE_MACOS 1
# endif
#endif
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
@@ -117,7 +117,7 @@
# define NOMINMAX
#endif
#if defined(LOVE_MACOSX) || defined(LOVE_IOS)
#if defined(LOVE_MACOS) || defined(LOVE_IOS)
# define LOVE_LEGENDARY_APP_ARGV_HACK
#endif
@@ -164,7 +164,7 @@
#endif
// Check we have a sane configuration
#if !defined(LOVE_WINDOWS) && !defined(LOVE_LINUX) && !defined(LOVE_IOS) && !defined(LOVE_MACOSX) && !defined(LOVE_ANDROID)
#if !defined(LOVE_WINDOWS) && !defined(LOVE_LINUX) && !defined(LOVE_IOS) && !defined(LOVE_MACOS) && !defined(LOVE_ANDROID)
# error Could not detect target platform
#endif
#if !defined(LOVE_LITTLE_ENDIAN) && !defined(LOVE_BIG_ENDIAN)
+5 -8
View File
@@ -18,18 +18,17 @@
* 3. This notice may not be removed or altered from any source distribution.
**/
#ifndef LOVE_OSX_H
#define LOVE_OSX_H
#pragma once
#include "config.h"
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOS
#include <string>
namespace love
{
namespace macosx
namespace macos
{
std::string getAppdataDirectory();
@@ -57,9 +56,7 @@ std::string getExecutablePath();
**/
void requestAttention(bool continuous);
} // macosx
} // macos
} // love
#endif // LOVE_MACOSX
#endif // LOVE_OSX_H
#endif // LOVE_MACOS
+4 -4
View File
@@ -18,9 +18,9 @@
* 3. This notice may not be removed or altered from any source distribution.
**/
#include "macosx.h"
#include "macos.h"
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOS
#import <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h>
@@ -33,7 +33,7 @@
namespace love
{
namespace macosx
namespace macos
{
static std::string getUserDirectory(NSSearchPathDirectory dir)
@@ -116,4 +116,4 @@ void requestAttention(bool continuous)
} // osx
} // love
#endif // LOVE_MACOSX
#endif // LOVE_MACOS