aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Conf.hpp31
-rw-r--r--include/env.hpp5
2 files changed, 34 insertions, 2 deletions
diff --git a/include/Conf.hpp b/include/Conf.hpp
index 709d285..7e5bf69 100644
--- a/include/Conf.hpp
+++ b/include/Conf.hpp
@@ -117,7 +117,10 @@ namespace sibs
PLATFORM_LINUX64,
PLATFORM_WIN32,
- PLATFORM_WIN64
+ PLATFORM_WIN64,
+
+ PLATFORM_MACOS32,
+ PLATFORM_MACOS64
};
enum class CVersion
@@ -163,7 +166,15 @@ namespace sibs
"config.linux64",
"config.linux64.static.debug",
- "config.linux64.static.release"
+ "config.linux64.static.release",
+
+ "config.macos32",
+ "config.macos32.static.debug",
+ "config.macos32.static.release"
+
+ "config.macos64",
+ "config.macos64.static.debug",
+ "config.macos64.static.release"
};
const int NUM_CONFIGS = 12;
@@ -199,6 +210,22 @@ namespace sibs
#endif
#define CONFIG_STATIC_LIB_FILE_EXTENSION "a"
#define CONFIG_DYNAMIC_LIB_FILE_EXTENSION "so"
+ #elif OS_TYPE == OS_TYPE_APPLE
+ #ifdef SIBS_ENV_32BIT
+ const Platform SYSTEM_PLATFORM = PLATFORM_MACOS32;
+ #define SYSTEM_PLATFORM_NAME "macos32"
+ #define CONFIG_SYSTEM_PLATFORM 12
+ #define CONFIG_STATIC_DEBUG_PLATFORM 13
+ #define CONFIG_STATIC_RELEASE_PLATFORM 14
+ #else
+ const Platform SYSTEM_PLATFORM = PLATFORM_MACOS64;
+ #define SYSTEM_PLATFORM_NAME "macos64"
+ #define CONFIG_SYSTEM_PLATFORM 15
+ #define CONFIG_STATIC_DEBUG_PLATFORM 16
+ #define CONFIG_STATIC_RELEASE_PLATFORM 17
+ #endif
+ #define CONFIG_STATIC_LIB_FILE_EXTENSION "a"
+ #define CONFIG_DYNAMIC_LIB_FILE_EXTENSION "dylib"
#endif
bool containsPlatform(const std::vector<Platform> &platforms, Platform platform);
diff --git a/include/env.hpp b/include/env.hpp
index 1ea55ca..fa9c860 100644
--- a/include/env.hpp
+++ b/include/env.hpp
@@ -6,6 +6,7 @@
#define OS_TYPE_WINDOWS 0
#define OS_TYPE_LINUX 1
+#define OS_TYPE_APPLE 2
#if defined(_WIN32) || defined(_WIN64)
#if defined(_WIN64)
@@ -39,6 +40,10 @@
#define OS_TYPE OS_TYPE_LINUX
#endif
+#ifdef __APPLE__
+ #define OS_TYPE OS_TYPE_APPLE
+#endif
+
#if defined(__GNUC__)
#if defined(__x86_64__) || defined(__pc64__)
#define SIBS_ENV_64BIT