move source config defines to configs.hpp

2026-03-22 04:44:09 +07:00 · 2020-01-28 08:34:47 +07:00
parent 8f0fac1750
commit 221ac93951
11 changed files with 112 additions and 112 deletions
--- a/headers/enduro2d/base/configs.hpp
+++ b/headers/enduro2d/base/configs.hpp
@@ -34,8 +34,8 @@
 // E2D_PLATFORM
 //

-#define E2D_PLATFORM_LINUX   1
-#define E2D_PLATFORM_IOS     2
+#define E2D_PLATFORM_IOS     1
+#define E2D_PLATFORM_LINUX   2
 #define E2D_PLATFORM_MACOSX  3
 #define E2D_PLATFORM_WINDOWS 4
 #define E2D_PLATFORM_ANDROID 5
@@ -79,3 +79,104 @@
 #ifndef E2D_BUILD_MODE
 #  error E2D_BUILD_MODE not detected
 #endif
+
+//
+// E2D_FILES_MODE
+//
+
+#define E2D_FILES_MODE_POSIX  1
+#define E2D_FILES_MODE_WINAPI 2
+
+#ifndef E2D_FILES_MODE
+#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
+#    define E2D_FILES_MODE E2D_FILES_MODE_POSIX
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
+#    define E2D_FILES_MODE E2D_FILES_MODE_POSIX
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
+#    define E2D_FILES_MODE E2D_FILES_MODE_POSIX
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
+#    define E2D_FILES_MODE E2D_FILES_MODE_WINAPI
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_ANDROID
+#    define E2D_FILES_MODE E2D_FILES_MODE_POSIX
+#  endif
+#endif
+
+#ifndef E2D_FILES_MODE
+#  error E2D_FILES_MODE not detected
+#endif
+
+//
+// E2D_AUDIO_MODE
+//
+
+#define E2D_AUDIO_MODE_NONE 1
+#define E2D_AUDIO_MODE_BASS 2
+
+#ifndef E2D_AUDIO_MODE
+#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
+#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_NONE
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
+#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_BASS
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
+#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_BASS
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
+#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_BASS
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_ANDROID
+#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_BASS
+#  endif
+#endif
+
+#ifndef E2D_AUDIO_MODE
+#  error E2D_AUDIO_MODE not detected
+#endif
+
+//
+// E2D_RENDER_MODE
+//
+
+#define E2D_RENDER_MODE_NONE 1
+#define E2D_RENDER_MODE_OPENGL 2
+#define E2D_RENDER_MODE_OPENGLES 3
+
+#ifndef E2D_RENDER_MODE
+#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
+#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGLES
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
+#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
+#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
+#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_ANDROID
+#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGLES
+#  endif
+#endif
+
+#ifndef E2D_RENDER_MODE
+#  error E2D_RENDER_MODE not detected
+#endif
+
+//
+// E2D_WINDOW_MODE
+//
+
+#define E2D_WINDOW_MODE_NONE 1
+#define E2D_WINDOW_MODE_GLFW 2
+
+#ifndef E2D_WINDOW_MODE
+#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
+#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_NONE
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
+#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
+#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
+#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW
+#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_ANDROID
+#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_NONE
+#  endif
+#endif
+
+#ifndef E2D_WINDOW_MODE
+#  error E2D_WINDOW_MODE not detected
+#endif
--- a/sources/enduro2d/core/audio_impl/audio.hpp
+++ b/sources/enduro2d/core/audio_impl/audio.hpp
@@ -9,22 +9,3 @@
 #include <enduro2d/core/audio.hpp>
 #include <enduro2d/core/debug.hpp>
 #include <enduro2d/core/profiler.hpp>
-
-#define E2D_AUDIO_MODE_NONE 1
-#define E2D_AUDIO_MODE_BASS 2
-
-#ifndef E2D_AUDIO_MODE
-#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
-#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_NONE
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
-#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_BASS
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
-#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_BASS
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
-#    define E2D_AUDIO_MODE E2D_AUDIO_MODE_BASS
-#  endif
-#endif
-
-#ifndef E2D_AUDIO_MODE
-#  error E2D_AUDIO_MODE not detected
-#endif
--- a/sources/enduro2d/core/platform_impl/platform.hpp
+++ b/sources/enduro2d/core/platform_impl/platform.hpp
@@ -8,28 +8,6 @@

 #include <enduro2d/core/platform.hpp>

-#define E2D_PLATFORM_MODE_NONE 1
-#define E2D_PLATFORM_MODE_IOS 2
-#define E2D_PLATFORM_MODE_LINUX 3
-#define E2D_PLATFORM_MODE_MACOSX 4
-#define E2D_PLATFORM_MODE_WINDOWS 5
-
-#ifndef E2D_PLATFORM_MODE
-#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
-#    define E2D_PLATFORM_MODE E2D_PLATFORM_MODE_IOS
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
-#    define E2D_PLATFORM_MODE E2D_PLATFORM_MODE_LINUX
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
-#    define E2D_PLATFORM_MODE E2D_PLATFORM_MODE_MACOSX
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
-#    define E2D_PLATFORM_MODE E2D_PLATFORM_MODE_WINDOWS
-#  endif
-#endif
-
-#ifndef E2D_PLATFORM_MODE
-#  error E2D_PLATFORM_MODE not detected
-#endif
-
 namespace e2d
 {
    class platform_internal_state_impl;
--- a/sources/enduro2d/core/platform_impl/platform_android.cpp
+++ b/sources/enduro2d/core/platform_impl/platform_android.cpp
@@ -6,23 +6,23 @@

 #include "platform.hpp"

-#if defined(E2D_PLATFORM_MODE) && E2D_PLATFORM_MODE == E2D_PLATFORM_MODE_NONE
+#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_ANDROID

 namespace
 {
    using namespace e2d;

-    class platform_internal_state_impl_none final : public platform_internal_state_impl {
+    class platform_internal_state_impl_android final : public platform_internal_state_impl {
    public:
-        platform_internal_state_impl_none() = default;
-        ~platform_internal_state_impl_none() noexcept final = default;
+        platform_internal_state_impl_android() = default;
+        ~platform_internal_state_impl_android() noexcept final = default;
    };
 }

 namespace e2d
 {
    platform_internal_state_impl_uptr platform_internal_state_impl::create() {
-        return std::make_unique<platform_internal_state_impl_none>();
+        return std::make_unique<platform_internal_state_impl_android>();
    }
 }

--- a/sources/enduro2d/core/platform_impl/platform_ios.cpp
+++ b/sources/enduro2d/core/platform_impl/platform_ios.cpp
@@ -6,7 +6,7 @@

 #include "platform.hpp"

-#if defined(E2D_PLATFORM_MODE) && E2D_PLATFORM_MODE == E2D_PLATFORM_MODE_IOS
+#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS

 namespace
 {
--- a/sources/enduro2d/core/platform_impl/platform_linux.cpp
+++ b/sources/enduro2d/core/platform_impl/platform_linux.cpp
@@ -6,7 +6,7 @@

 #include "platform.hpp"

-#if defined(E2D_PLATFORM_MODE) && E2D_PLATFORM_MODE == E2D_PLATFORM_MODE_LINUX
+#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX

 namespace
 {
--- a/sources/enduro2d/core/platform_impl/platform_macosx.cpp
+++ b/sources/enduro2d/core/platform_impl/platform_macosx.cpp
@@ -6,7 +6,7 @@

 #include "platform.hpp"

-#if defined(E2D_PLATFORM_MODE) && E2D_PLATFORM_MODE == E2D_PLATFORM_MODE_MACOSX
+#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX

 namespace
 {
--- a/sources/enduro2d/core/platform_impl/platform_windows.cpp
+++ b/sources/enduro2d/core/platform_impl/platform_windows.cpp
@@ -6,7 +6,7 @@

 #include "platform.hpp"

-#if defined(E2D_PLATFORM_MODE) && E2D_PLATFORM_MODE == E2D_PLATFORM_MODE_WINDOWS
+#if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS

 #include <windows.h>

--- a/sources/enduro2d/core/render_impl/render.hpp
+++ b/sources/enduro2d/core/render_impl/render.hpp
@@ -10,25 +10,3 @@
 #include <enduro2d/core/profiler.hpp>
 #include <enduro2d/core/render.hpp>
 #include <enduro2d/core/window.hpp>
-
-#define E2D_RENDER_MODE_NONE 1
-#define E2D_RENDER_MODE_OPENGL 2
-#define E2D_RENDER_MODE_OPENGLES 3
-
-#ifndef E2D_RENDER_MODE
-#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
-#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGLES
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
-#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
-#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
-#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGL
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_ANDROID
-#    define E2D_RENDER_MODE E2D_RENDER_MODE_OPENGLES
-#  endif
-#endif
-
-#ifndef E2D_RENDER_MODE
-#  error E2D_RENDER_MODE not detected
-#endif
--- a/sources/enduro2d/core/window_impl/window.hpp
+++ b/sources/enduro2d/core/window_impl/window.hpp
@@ -9,22 +9,3 @@
 #include <enduro2d/core/debug.hpp>
 #include <enduro2d/core/profiler.hpp>
 #include <enduro2d/core/window.hpp>
-
-#define E2D_WINDOW_MODE_NONE 1
-#define E2D_WINDOW_MODE_GLFW 2
-
-#ifndef E2D_WINDOW_MODE
-#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
-#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_NONE
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
-#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
-#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
-#    define E2D_WINDOW_MODE E2D_WINDOW_MODE_GLFW
-#  endif
-#endif
-
-#ifndef E2D_WINDOW_MODE
-#  error E2D_WINDOW_MODE not detected
-#endif
--- a/sources/enduro2d/utils/filesystem_impl/files.hpp
+++ b/sources/enduro2d/utils/filesystem_impl/files.hpp
@@ -10,25 +10,6 @@
 #include <enduro2d/utils/strings.hpp>
 #include <enduro2d/utils/filesystem.hpp>

-#define E2D_FILES_MODE_POSIX  1
-#define E2D_FILES_MODE_WINAPI 2
-
-#ifndef E2D_FILES_MODE
-#  if defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_IOS
-#    define E2D_FILES_MODE E2D_FILES_MODE_POSIX
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_LINUX
-#    define E2D_FILES_MODE E2D_FILES_MODE_POSIX
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_MACOSX
-#    define E2D_FILES_MODE E2D_FILES_MODE_POSIX
-#  elif defined(E2D_PLATFORM) && E2D_PLATFORM == E2D_PLATFORM_WINDOWS
-#    define E2D_FILES_MODE E2D_FILES_MODE_WINAPI
-#  endif
-#endif
-
-#ifndef E2D_FILES_MODE
-#  error E2D_FILES_MODE not detected
-#endif
-
 namespace e2d::impl
 {
    read_file_uptr make_read_file(str_view path) noexcept;