asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows export: Use WINE to run rcedit on non-Windows host

Browse source 
WINE can be either run from a provided path ("export/windows/wine"),
or looked up in the system PATH.

Fixes #14441.
This commit is contained in:
Rémi Verschelde 2017-12-09 11:41:56 +01:00
parent 3fd1c0c76b
commit ae012f2381
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
platform/windows/export/export.cpp
View file

@ -48,6 +48,30 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
} }
String rcedit_path = EditorSettings::get_singleton()->get("export/windows/rcedit"); String rcedit_path = EditorSettings::get_singleton()->get("export/windows/rcedit");
if (rcedit_path == String()) {
return OK;
}
if (!FileAccess::exists(rcedit_path)) {
ERR_PRINTS("Could not find rcedit executable at " + rcedit_path + ", aborting.");
return ERR_FILE_NOT_FOUND;
}
#ifndef WINDOWS_ENABLED
// On non-Windows we need WINE to run rcedit
String wine_path = EditorSettings::get_singleton()->get("export/windows/wine");
if (wine_path != String() && !FileAccess::exists(wine_path)) {
ERR_PRINTS("Could not find wine executable at " + wine_path + ", aborting.");
return ERR_FILE_NOT_FOUND;
}
if (wine_path == String()) {
wine_path = "wine"; // try to run wine from PATH
}
#endif
String icon_path = p_preset->get("application/icon"); String icon_path = p_preset->get("application/icon");
String file_verion = p_preset->get("application/file_version"); String file_verion = p_preset->get("application/file_version");
String product_version = p_preset->get("application/product_version"); String product_version = p_preset->get("application/product_version");
@ -58,14 +82,6 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
String trademarks = p_preset->get("application/trademarks"); String trademarks = p_preset->get("application/trademarks");
String comments = p_preset->get("application/comments"); String comments = p_preset->get("application/comments");
if (rcedit_path == String()) {
return OK;
}
if (!FileAccess::exists(rcedit_path)) {
return ERR_FILE_NOT_FOUND;
}
List<String> args; List<String> args;
args.push_back(p_path); args.push_back(p_path);
if (icon_path != String()) { if (icon_path != String()) {
@ -106,7 +122,14 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
args.push_back(trademarks); args.push_back(trademarks);
} }
#ifdef WINDOWS_ENABLED
OS::get_singleton()->execute(rcedit_path, args, true); OS::get_singleton()->execute(rcedit_path, args, true);
#else
// On non-Windows we need WINE to run rcedit
args.push_front(rcedit_path);
OS::get_singleton()->execute(wine_path, args, true);
#endif
return OK; return OK;
} }
@ -127,6 +150,11 @@ void register_windows_exporter() {
EDITOR_DEF("export/windows/rcedit", ""); EDITOR_DEF("export/windows/rcedit", "");
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/windows/rcedit", PROPERTY_HINT_GLOBAL_FILE, "*.exe")); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/windows/rcedit", PROPERTY_HINT_GLOBAL_FILE, "*.exe"));
#ifndef WINDOWS_ENABLED
// On non-Windows we need WINE to run rcedit
EDITOR_DEF("export/windows/wine", "");
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/windows/wine", PROPERTY_HINT_GLOBAL_FILE));
#endif
Ref<EditorExportPlatformWindows> platform; Ref<EditorExportPlatformWindows> platform;
platform.instance(); platform.instance();