French language support

ivan-ushakov · May 23, 2024 · 128de8f · 128de8f
1 parent e895310
commit 128de8f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/MechoSoma/CMakeLists.txt b/MechoSoma/CMakeLists.txt
@@ -558,12 +558,22 @@ elseif (APPLE)
     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
     add_executable(${APPLICATION_NAME} MACOSX_BUNDLE ${APPLICATION_SOURCES})
     set_property(TARGET ${APPLICATION_NAME} PROPERTY MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Info.plist.in")
-    target_compile_options(${APPLICATION_NAME} PRIVATE -x objective-c++)
-    target_link_libraries(${APPLICATION_NAME} PRIVATE stdc++
-            "-framework CoreFoundation" "-framework Cocoa" "-framework QuartzCore" "-framework OpenGL" 
-            "-framework CoreAudio" "-framework AudioToolbox" "-framework ForceFeedback" "-framework CoreHaptics"
-            "-framework GameController" "-framework IOKit" "-framework Carbon" "-framework Metal"
-            objc ${LIBRARY_NAME} ${COMMON_APPLICATION_LIBRARIES})
+    target_link_libraries(${APPLICATION_NAME} PRIVATE
+        "-framework AudioToolbox"
+        "-framework Carbon"
+        "-framework Cocoa"
+        "-framework CoreAudio"
+        "-framework CoreFoundation"
+        "-framework CoreHaptics"
+        "-framework ForceFeedback"
+        "-framework GameController"
+        "-framework IOKit"
+        "-framework Metal"
+        "-framework OpenGL" 
+        "-framework QuartzCore"
+        ${LIBRARY_NAME}
+        ${COMMON_APPLICATION_LIBRARIES}
+    )
 
     if (STEAM_VERSION)
         set(APP_BUNDLE_CONTENTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app/Contents")

diff --git a/MechoSoma/XTool/filesystem.cpp b/MechoSoma/XTool/filesystem.cpp
@@ -8,7 +8,7 @@
 
 namespace localization {
     std::unordered_set<std::string> supportedLanguages = {
-           "ru", "en", "it", "cz", "lt"
+          "cz", "en", "fr", "it", "lt", "ru"
     };
     std::unordered_set<std::string> localizedFiles = {
           "resource/iscreen/itext.scb",

diff --git a/MechoSoma/app/main.cpp b/MechoSoma/app/main.cpp
@@ -92,7 +92,7 @@ int game_main(int argc, char const *argv[]) {
   localization::setLanguage(gpx()->sys()->getLanguage().c_str());
 #else
 int main(int argc, char const *argv[]) {
-  #ifdef STEAM_VERSION1
+  #ifdef STEAM_VERSION
   if (!SteamAPI_Init()) {
     return 1;
   }
@@ -102,6 +102,7 @@ int main(int argc, char const *argv[]) {
     LanguagePair("english", "en"),
     LanguagePair("czech", "cz"),
     LanguagePair("italian", "it"),
+    LanguagePair("french", "fr"),
     LanguagePair("lithuanian", "lt"),
     LanguagePair("russian", "ru")
   };