fix

proller · Nov 13, 2024 · 16a7695 · 16a7695
1 parent ebca723
commit 16a7695
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -48,7 +48,7 @@ jobs:
           mkdir build
           cd build
           cmake .. \
-            -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=11.7 \
             -DCMAKE_FIND_FRAMEWORK=LAST \
             -DCMAKE_INSTALL_PREFIX=../build/macos/ \
             -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1423,6 +1423,7 @@ if(MSVC)
 else()
 	# GCC or compatible compilers such as Clang
 	set(WARNING_FLAGS "-Wall -Wextra -Wno-unused-parameter -Werror=vla")
+	set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-braced-scalar-init")
 	if(WARN_ALL)
 		set(RELEASE_WARNING_FLAGS "${WARNING_FLAGS}")
 	else()

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
@@ -334,9 +334,13 @@ void fm_set_default_settings(Settings *settings) {
 	settings->setDefault("leaves_style", "opaque");
 	//settings->setDefault("mg_name", "v7");
 
+#if 0
+// fmtodo merge
 	char lang[3] = {};
 	AConfiguration_getLanguage(porting::app_global->config, lang);
 	settings->setDefault("language", lang);
+#endif
+
 	settings->setDefault("android_keyboard", "0");
 	settings->setDefault("texture_min_size", "16");
 	settings->setDefault("cloud_radius", "6");