Enabled Qt components built on Haiku

WohlSoft · Feb 14, 2024 · dc4e245 · dc4e245
1 parent 506e15c
commit dc4e245
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 14 deletions.
diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt
@@ -758,7 +758,7 @@ else()
  list(APPEND PGE_EDITOR_LINK_LIBS PGE_SDLMixerX PGE_SDL2)
 endif()
 
-if(NOT APPLE AND NOT MSVC AND NOT PGE_ENABLE_STATIC_QT AND NOT USE_SYSTEM_LIBC)
+if(NOT APPLE AND NOT MSVC AND NOT HAIKU AND NOT PGE_ENABLE_STATIC_QT AND NOT USE_SYSTEM_LIBC)
  set_property(TARGET pge_editor APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++")
 endif()
 

diff --git a/Editor/common_features/app_path.cpp b/Editor/common_features/app_path.cpp
@@ -37,7 +37,7 @@ QString ApplicationPath_x;
 QString AppPathManager::m_settingsPath;
 QString AppPathManager::m_userPath;
 
-#if defined(__ANDROID__) || defined(__APPLE__)
+#if defined(__ANDROID__) || defined(__APPLE__) || defined(__HAIKU__)
 # define UserDirName "/PGE Project"
 #else
 # define UserDirName "/.PGE_Project"

diff --git a/Editor/common_features/crashhandler.cpp b/Editor/common_features/crashhandler.cpp
@@ -50,6 +50,29 @@
 #define STR_EXPAND(tok) #tok
 #define STR(tok) STR_EXPAND(tok)
 
+// Exclude platforms that don't have SIG_INFO support
+#if !defined(_WIN32) \
+&& !defined(__3DS__) \
+ && !defined(__WII__) \
+ && !defined(__WIIU__) \
+ && !defined(__SWITCH__) \
+ && !defined(VITA)
+# define HAS_SIG_INFO
+#endif
+
+// Exclude personal data removal from platforms where API doesn't allows to recognise the user and/or home directory
+#if !defined(VITA) \
+ && !defined(__3DS__) \
+ && !defined(__WII__) \
+ && !defined(__WIIU__) \
+ && !defined(__SWITCH__) \
+ && !defined(__EMSCRIPTEN__) \
+ && !defined(__ANDROID__) \
+ && !defined(__HAIKU__)
+# define DO_REMOVE_PERSONAL_DATA
+#endif
+
+
 static const char *g_messageToUser =
  "\n"
  "================================================\n"
@@ -126,6 +149,7 @@ static bool GetStackWalk(std::string &outWalk)
 }
 #endif
 
+#ifdef DO_REMOVE_PERSONAL_DATA
 static QString getCurrentUserName()
 {
  QString user;
@@ -162,7 +186,7 @@ static void removePersonalData(QString &log)
  }
  log.replace(user, "anonymouse");
 }
-
+#endif // DO_REMOVE_PERSONAL_DATA
 
 QString CrashHandler::getStacktrace()
 {
@@ -187,7 +211,9 @@ QString CrashHandler::getStacktrace()
 
 #endif
 
+#ifdef DO_REMOVE_PERSONAL_DATA
  removePersonalData(bkTrace);
+#endif
  return bkTrace;
 }
 

diff --git a/Editor/common_features/file_keeper.cpp b/Editor/common_features/file_keeper.cpp
@@ -128,7 +128,11 @@ void FileKeeper::restore()
  if(!m_origPath.isEmpty() && !m_tempPath.isEmpty() && QFile::exists(m_tempPath))
  {
 #ifndef __WIN32
+# ifdef __HAIKU__
+ int fd = open(m_tempPath.toUtf8().data(), O_SYNC | O_APPEND, 0660);
+# else
  int fd = open(m_tempPath.toUtf8().data(), O_FSYNC | O_APPEND, 0660);
+# endif
 
  if(fd)
  {

diff --git a/Editor/main.cpp b/Editor/main.cpp
@@ -23,7 +23,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QSettings>
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) && QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
 #include <QLibraryInfo>
 #define MOONDUST_QSTYLERPOXY_WORKAROUND_NEEDED
 #endif

diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -486,7 +486,7 @@ else()
  list(APPEND PGE_ENGINE_LINK_LIBS PGE_SDLMixerX PGE_SDL2)
 endif()
 
-if(NOT APPLE AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
+if(NOT APPLE AND NOT HAIKU AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
  set_property(TARGET pge_engine APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++")
 endif()
 

diff --git a/GIFs2PNG/CMakeLists.txt b/GIFs2PNG/CMakeLists.txt
@@ -96,7 +96,7 @@ list(APPEND GIFs2PNG_INSTALLS
  GIFs2PNG
 )
 
-if(NOT APPLE AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
+if(NOT APPLE AND NOT HAIKU AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
  set_property(TARGET GIFs2PNG APPEND_STRING PROPERTY LINK_FLAGS "-static-libgcc -static-libstdc++")
 endif()
 

diff --git a/LazyFixTool/CMakeLists.txt b/LazyFixTool/CMakeLists.txt
@@ -91,7 +91,7 @@ list(APPEND LazyFixTool_INSTALLS
  LazyFixTool
 )
 
-if(NOT APPLE AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
+if(NOT APPLE AND NOT HAIKU AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
  set_property(TARGET LazyFixTool APPEND_STRING PROPERTY LINK_FLAGS "-static-libgcc -static-libstdc++")
 endif()
 

diff --git a/Maintainer/CMakeLists.txt b/Maintainer/CMakeLists.txt
@@ -209,7 +209,7 @@ if(WIN32)
  version
  )
 else()
- if(UNIX AND NOT APPLE)
+ if(UNIX AND NOT APPLE AND NOT HAIKU)
  list(APPEND PGE_MAINTAINER_LINK_LIBS dl)
  endif()
 endif()

diff --git a/Maintainer/common_features/app_path.cpp b/Maintainer/common_features/app_path.cpp
@@ -36,7 +36,7 @@ QString ApplicationPath_x;
 QString AppPathManager::m_settingsPath;
 QString AppPathManager::m_userPath;
 
-#if defined(__ANDROID__) || defined(__APPLE__)
+#if defined(__ANDROID__) || defined(__APPLE__) || defined(__HAIKU__)
 # define UserDirName "/PGE Project"
 #else
 # define UserDirName "/.PGE_Project"

diff --git a/MusicPlayer/CMakeLists.txt b/MusicPlayer/CMakeLists.txt
@@ -171,7 +171,7 @@ else()
  endif()
 endif()
 
-if(NOT APPLE AND NOT MSVC AND NOT PGE_ENABLE_STATIC_QT AND NOT USE_SYSTEM_LIBC)
+if(NOT APPLE AND NOT HAIKU AND NOT MSVC AND NOT PGE_ENABLE_STATIC_QT AND NOT USE_SYSTEM_LIBC)
  set_property(TARGET pge_musplay APPEND_STRING PROPERTY LINK_FLAGS "-static-libgcc -static-libstdc++")
 endif()
 

diff --git a/PNG2GIFs/CMakeLists.txt b/PNG2GIFs/CMakeLists.txt
@@ -91,7 +91,7 @@ list(APPEND PNG2GIFs_INSTALLS
  PNG2GIFs
 )
 
-if(NOT APPLE AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
+if(NOT APPLE AND NOT HAIKU AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
  set_property(TARGET PNG2GIFs APPEND_STRING PROPERTY LINK_FLAGS "-static-libgcc -static-libstdc++")
 endif()
 

diff --git a/PaletteFilter/CMakeLists.txt b/PaletteFilter/CMakeLists.txt
@@ -91,7 +91,7 @@ list(APPEND PaletteFilter_INSTALLS
  PaletteFilter
 )
 
-if(NOT APPLE AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
+if(NOT APPLE AND NOT HAIKU AND NOT MSVC AND NOT USE_SYSTEM_LIBC)
  set_property(TARGET PaletteFilter APPEND_STRING PROPERTY LINK_FLAGS "-static-libgcc -static-libstdc++")
 endif()
 

diff --git a/_common/find_linguist.cmake b/_common/find_linguist.cmake
@@ -141,6 +141,10 @@ set(POSSIBLE_QT_PATHS
  "C:/Qt/5.11/mingw530_32/bin"
 )
 
+if(HAIKU)
+ list(APPEND POSSIBLE_QT_PATHS "/bin/")
+endif()
+
 find_program(_QT_LRELEASE_PROGRAM lrelease NO_DEFAULT_PATH PATHS ${POSSIBLE_QT_PATHS})
 if(_QT_LRELEASE_PROGRAM)
  message(STATUS "Found ${_QT_LRELEASE_PROGRAM}, locales will be compiled!")

diff --git a/_common/library_luajit.cmake b/_common/library_luajit.cmake
@@ -32,7 +32,6 @@ if(PGE_USE_LUAJIT)
  "-DLUAJIT_FORCE_UTF8_FOPEN=ON"
  ${ANDROID_CMAKE_FLAGS}
  ${APPLE_CMAKE_FLAGS}
- ${LUAJIT_USE_CMAKE_FLAG}
  BUILD_BYPRODUCTS
  "${libLuaJit_Lib}"
  )

diff --git a/_common/library_qt.cmake b/_common/library_qt.cmake
@@ -1,6 +1,6 @@
 set(PGE_ENABLE_QT_ENABLED_BY_DEFAULT ON)
 
-if(HAIKU OR EMSCRIPTEN OR ANDROID)
+if(EMSCRIPTEN OR ANDROID)
  set(PGE_ENABLE_QT_ENABLED_BY_DEFAULT OFF)
  message("== Qt-dependent components are not supported for this platform")
  include(_common/find_linguist.cmake)