|
@@ -241,11 +241,21 @@ void GDMono::initialize() {
|
|
assembly_rootdir = bundled_assembly_rootdir;
|
|
assembly_rootdir = bundled_assembly_rootdir;
|
|
config_dir = bundled_config_dir;
|
|
config_dir = bundled_config_dir;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+#ifdef WINDOWS_ENABLED
|
|
|
|
+ if (assembly_rootdir.empty() || config_dir.empty()) {
|
|
|
|
+ // Assertion: if they are not set, then they weren't found in the registry
|
|
|
|
+ CRASH_COND(mono_reg_info.assembly_dir.length() > 0 || mono_reg_info.config_dir.length() > 0);
|
|
|
|
+
|
|
|
|
+ ERR_PRINT("Cannot find Mono in the registry");
|
|
|
|
+ }
|
|
|
|
+#endif // WINDOWS_ENABLED
|
|
|
|
+
|
|
#else
|
|
#else
|
|
// These are always the directories in export templates
|
|
// These are always the directories in export templates
|
|
assembly_rootdir = bundled_assembly_rootdir;
|
|
assembly_rootdir = bundled_assembly_rootdir;
|
|
config_dir = bundled_config_dir;
|
|
config_dir = bundled_config_dir;
|
|
-#endif
|
|
|
|
|
|
+#endif // TOOLS_ENABLED
|
|
|
|
|
|
// Leak if we call mono_set_dirs more than once
|
|
// Leak if we call mono_set_dirs more than once
|
|
mono_set_dirs(assembly_rootdir.length() ? assembly_rootdir.utf8().get_data() : NULL,
|
|
mono_set_dirs(assembly_rootdir.length() ? assembly_rootdir.utf8().get_data() : NULL,
|