more hacks

godotengine · Aug 31, 2024 · 7268ef1 · 7268ef1
1 parent 2b25e3d
commit 7268ef1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/modules/mbedtls/SCsub b/modules/mbedtls/SCsub
@@ -10,6 +10,11 @@ env_mbed_tls = env_modules.Clone()
 thirdparty_obj = []
 
 if env["builtin_mbedtls"]:
+ if env.msvc:
+ # TODO this should be enabled in platform/windows/detect.py (configure_msvc)
+ env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES','$ARCOMSTR')}"
+ env_mbed_tls = env_modules.Clone()
+
  thirdparty_sources = [
  "aes.c",
  "aesce.c",
@@ -125,9 +130,6 @@ if env["builtin_mbedtls"]:
  env_mbed_tls.Append(CPPDEFINES=[("MBEDTLS_CONFIG_FILE", config_path)])
 
  env_thirdparty = env_mbed_tls.Clone()
- if env.msvc:
- # TODO this should be enabled project wise maybe?
- env_thirdparty['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES','$ARCOMSTR')}"
  env_thirdparty.disable_warnings()
  env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
  env_thirdparty.Depends(thirdparty_obj, "#thirdparty/mbedtls/include/godot_module_mbedtls_config.h")