diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f0cc1..685a66d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ include(FindPackageHandleStandardArgs)
option(STEAM "Build for Steam" OFF)
option(DEBUG "Debug mode" ON)
option(NATIVE "Use native instructions(for local use only)" OFF)
-option(MODLOADER "Build with modloader" ON)
#Configuration
set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
@@ -158,10 +157,8 @@ elseif(BSD)
list(APPEND MAIN_SOURCE src/xdg-user-dir-lookup.c)
list(APPEND MAIN_HEADERS src/xdg-user-dir-lookup.h)
set(STEAM OFF)
- set(MODLOADER OFF)
elseif(EMSCRIPTEN)
set(STEAM OFF)
- set(MODLOADER OFF)
set(CMAKE_EXECUTABLE_SUFFIX ".html" CACHE INTERNAL "")
elseif(APPLE)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM)
@@ -367,11 +364,9 @@ find_package(Ruby 3.0 REQUIRED COMPONENTS Development)
pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
find_package_handle_standard_args(pixman-1 DEFAULT_MSG PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR)
mark_as_advanced(PIXMAN_INCLUDE_DIR PIXMAN_LIBRARY)
-if(MODLOADER)
- find_package(OpenSSL CONFIG REQUIRED COMPONENTS Crypto)
- pkg_check_modules(SIGC2 REQUIRED sigc++-2.0)
- pkg_check_modules(LIBZIP REQUIRED libzip)
-endif()
+find_package(OpenSSL CONFIG REQUIRED COMPONENTS Crypto)
+pkg_check_modules(SIGC2 REQUIRED sigc++-2.0)
+pkg_check_modules(LIBZIP REQUIRED libzip)
target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES})
target_include_directories(${PROJECT_NAME} PRIVATE src include ${PIXMAN_INCLUDE_DIR} ${SIGC2_INCLUDE_DIRS}
@@ -384,12 +379,8 @@ physfs ${PIXMAN_LIBRARY} ${SIGC2_LIBRARIES} ${PLATFORM_LIBRARIES}
${Ruby_LIBRARIES} Boost::boost Boost::chrono ${Boost_LIBRARIES}
${VORBISFILE_LIBRARIES} ZLIB::ZLIB ${PLATFORM_LIBS})
-if(MODLOADER)
- target_include_directories(${PROJECT_NAME} PRIVATE ${LIBZIP_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
- target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBZIP_LIBRARIES} OpenSSL::Crypto)
-else()
-
-endif()
+target_include_directories(${PROJECT_NAME} PRIVATE ${LIBZIP_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBZIP_LIBRARIES} OpenSSL::Crypto)
if(STEAM)
add_subdirectory(steamshim_parent)
diff --git a/PORTING.md b/PORTING.md
index b7eac1f..fda9b3d 100644
--- a/PORTING.md
+++ b/PORTING.md
@@ -12,11 +12,11 @@
| Solaris/OpenSolaris | 1% | В работе |
| RedoxOS | 0% | Не хватает библеотек |
| Android | 4% | В работе |
-| PS Vita | 0% | В работе |
+| PS Vita | 1% | В работе |
| PSP | 1% | В работе |
| Emspritein(web) | 11% | Нет хватает библеотек
\* Нужно написать порт библеотеки libsigc++2
(А лучше 3 и переписать движок)
\* Проблемы с компиляцией и зависимостями |
-| HaikuOS | 0% | В работе |
-| DOS | 0.2% | Не в работе |
+| HaikuOS | 1% | В работе |
+| DOS | 1% | Не в работе |
| Ubuntu Touch | 61% | Будет почти готово тогда когда Linux порт будет доведён до ума |
| Аврора ОС | 0% | Возможно, но пока не в работе |
| ChromeOS/ChromiumOS | 0.4% | Неизвестное |
diff --git a/src/define.h b/src/define.h
index cc02cd8..f5d01bb 100644
--- a/src/define.h
+++ b/src/define.h
@@ -1,5 +1,70 @@
-#if defined(__linux__) || defined(__sun) || defined(__APPLE__) || \
- defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
- defined(__GNU__) || defined(__hurd__) || defined(__DragonFly__)
- #define unix_like 1
+#include
+
+#if defined(SDL_PLATFORM_AIX) || defined(SDL_PLATFORM_BSDI) || defined(SDL_PLATFORM_FREEBSD) || \
+ defined(SDL_PLATFORM_HPUX) || defined(SDL_PLATFORM_HURD) || defined(SDL_PLATFORM_IRIX) || \
+ defined(SDL_PLATFORM_LINUX) || defined(SDL_PLATFORM_MACOS) || defined(SDL_PLATFORM_NETBSD) || \
+ defined(SDL_PLATFORM_OPENBSD) || defined(SDL_PLATFORM_SOLARIS) || defined(SDL_PLATFORM_UNIX) || \
+ defined(SDL_PLATFORM_APPLE) || defined(SDL_PLATFORM_OSF)
+ #define unix_like 1
#endif
+
+#if defined(SDL_PLATFORM_DOS)
+ #define dos 1
+#endif
+
+#if defined(SDL_WINAPI_FAMILY_PHONE) || defined(SDL_PLATFORM_WINDOWS) || defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
+ #define windows 1
+#endif
+
+#if defined(SDL_PLATFORM_XBOXSERIES) || defined(SDL_PLATFORM_XBOXONE)
+ #define xbox 1
+#endif
+
+#if SDL_PLATFORM_3DS
+ #define 3ds 1
+#endif
+
+#if SDL_PLATFORM_ANDROID
+ #define android 1
+#endif
+
+#if defined(SDL_PLATFORM_APPLE) || defined(SDL_PLATFORM_TVOS) || defined(SDL_PLATFORM_VISIONOS)
+ #define apple 1
+#endif
+
+#if SDL_PLATFORM_EMSCRIPTEN
+ #define web 1
+#endif
+
+#if SDL_PLATFORM_HAIKU
+ #define haiku 1
+#endif
+
+#if SDL_PLATFORM_IOS
+ #define ios 1
+#endif
+
+#if defined(SDL_PLATFORM_OS2)
+ #define os2 1
+#endif
+
+#if SDL_PLATFORM_PS2
+ #define ps2 1
+#endif
+
+#if SDL_PLATFORM_PSP
+ #define psp 1
+#endif
+
+#if SDL_PLATFORM_QNXNTO
+ #define qnx 1
+#endif
+
+#if SDL_PLATFORM_VITA
+ #define vita 1
+#endif
+
+#if SDL_PLATFORM_RISCOS
+ #define riscos 1
+#endif
+
diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index c93221c..9b913fb 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -32,19 +32,16 @@
#include
#include
#include
+#include
#include "sharedstate.h"
#include "graphics.h"
#include "al-util.h"
#include "debugwriter.h"
-
#include "oneshot.h"
-#include
-
#include
#include