godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

-Renamed GlobalConfig to ProjectSettings, makes more sense.

Browse Source 
-Added system for feature overrides, it's pretty cool :)
This commit is contained in:
Juan Linietsky
2017-07-19 17:00:46 -03:00
parent 89588d4334
commit 25678b1876
162 changed files with 1296 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/uwp/export/export.cpp
View File

@@ -32,12 +32,12 @@
#include "bind/core_bind.h"
#include "editor/editor_export.h"
#include "editor/editor_node.h"
#include "global_config.h"
#include "io/marshalls.h"
#include "io/zip_io.h"
#include "object.h"
#include "os/file_access.h"
#include "platform/uwp/logo.gen.h"
#include "project_settings.h"
#include "version.h"
#include "thirdparty/minizip/unzip.h"
@@ -774,7 +774,8 @@ class EditorExportUWP : public EditorExportPlatform {
String architecture = arch == ARM ? "ARM" : arch == X86 ? "x86" : "x64";
result = result.replace("$architecture$", architecture);
result = result.replace("$display_name$", String(p_preset->get("package/display_name")).empty() ? (String)GlobalConfig::get_singleton()->get("application/config/name") : String(p_preset->get("package/display_name")));
result = result.replace("$display_name$", String(p_preset->get("package/display_name")).empty() ? (String)ProjectSettings::get_singleton()->get("application/config/name") : String(p_preset->get("package/display_name")));
result = result.replace("$publisher_display_name$", p_preset->get("package/publisher_display_name"));
result = result.replace("$app_description$", p_preset->get("package/description"));
result = result.replace("$bg_color$", p_preset->get("images/background_color"));
@@ -1008,6 +1009,9 @@ public:
virtual String get_name() const {
return "Windows Universal";
}
virtual String get_os_name() const {
return "UWP";
}
virtual String get_binary_extension() const {
return "appx";
@@ -1369,6 +1373,12 @@ public:
return OK;
}
virtual void get_platform_features(List<String> *r_features) {
r_features->push_back("pc");
r_features->push_back("UWP");
}
EditorExportUWP() {
Ref<Image> img = memnew(Image(_uwp_logo));
logo.instance();