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
+4 -4
View File
@@ -26,8 +26,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#if defined(LOVE_MACOSX)
#include "common/macosx.h"
#if defined(LOVE_MACOS)
#include "common/macos.h"
#elif defined(LOVE_IOS)
#include "common/ios.h"
#elif defined(LOVE_WINDOWS)
@@ -92,8 +92,8 @@ bool Filesystem::isRealDirectory(const std::string &path) const
std::string Filesystem::getExecutablePath() const
{
#if defined(LOVE_MACOSX)
return love::macosx::getExecutablePath();
#if defined(LOVE_MACOS)
return love::macos::getExecutablePath();
#elif defined(LOVE_IOS)
return love::ios::getExecutablePath();
#elif defined(LOVE_WINDOWS)
+1 -1
View File
@@ -41,7 +41,7 @@
# define LOVE_PATH_SEPARATOR "/"
# define LOVE_MAX_PATH _MAX_PATH
#else
# if defined(LOVE_MACOSX) || defined(LOVE_IOS)
# if defined(LOVE_MACOS) || defined(LOVE_IOS)
# define LOVE_APPDATA_FOLDER "LOVE"
# elif defined(LOVE_LINUX)
# define LOVE_APPDATA_FOLDER "love"
+4 -4
View File
@@ -46,8 +46,8 @@
# include "common/ios.h"
#endif
#ifdef LOVE_MACOSX
# include "common/macosx.h"
#ifdef LOVE_MACOS
# include "common/macos.h"
#endif
#include <string>
@@ -500,8 +500,8 @@ std::string Filesystem::getAppdataDirectory()
wchar_t *w_appdata = _wgetenv(L"APPDATA");
appdata = to_utf8(w_appdata);
replace_char(appdata, '\\', '/');
#elif defined(LOVE_MACOSX)
appdata = normalize(love::macosx::getAppdataDirectory());
#elif defined(LOVE_MACOS)
appdata = normalize(love::macos::getAppdataDirectory());
#elif defined(LOVE_IOS)
appdata = normalize(love::ios::getAppdataDirectory());
#elif defined(LOVE_LINUX)
+1 -1
View File
@@ -747,7 +747,7 @@ static const char *library_extensions[] =
{
#ifdef LOVE_WINDOWS
".dll"
#elif defined(LOVE_MACOSX) || defined(LOVE_IOS)
#elif defined(LOVE_MACOS) || defined(LOVE_IOS)
".dylib", ".so"
#else
".so"