You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-05 12:10:55 +00:00
Platform: Ensure classes match their header filename
Also drop some unused files. Renamed: - `platform/iphone/sem_iphone.h` -> `semaphore_iphone.h` (same for `osx`) - `platform/uwp/gl_context_egl.h` -> `context_egl_uwp.h` - in `platform/windows`: `context_gl_win.h`, `crash_handler_win.h`, `godot_win.cpp`, `joypad.h` and `key_mapping_win.h` all renamed to use `windows`. Some classes renamed accordingly too. - `EditorExportAndroid` and `EditorExportUWP` renamed to `EditorExportPlatformAndroid` and `EditorExportPlatformUWP` - `power_android` and `power_osx` renamed to `PowerAndroid` and `PowerOSX` - `OSUWP` renamed to `OS_UWP` Dropped: - `platform/windows/ctxgl_procaddr.h`
This commit is contained in:
@@ -646,9 +646,9 @@ AppxPackager::~AppxPackager() {}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
|
||||
class EditorExportUWP : public EditorExportPlatform {
|
||||
class EditorExportPlatformUWP : public EditorExportPlatform {
|
||||
|
||||
GDCLASS(EditorExportUWP, EditorExportPlatform);
|
||||
GDCLASS(EditorExportPlatformUWP, EditorExportPlatform);
|
||||
|
||||
Ref<ImageTexture> logo;
|
||||
|
||||
@@ -1035,13 +1035,13 @@ public:
|
||||
r_features->push_back("s3tc");
|
||||
r_features->push_back("etc");
|
||||
switch ((int)p_preset->get("architecture/target")) {
|
||||
case EditorExportUWP::ARM: {
|
||||
case EditorExportPlatformUWP::ARM: {
|
||||
r_features->push_back("arm");
|
||||
} break;
|
||||
case EditorExportUWP::X86: {
|
||||
case EditorExportPlatformUWP::X86: {
|
||||
r_features->push_back("32");
|
||||
} break;
|
||||
case EditorExportUWP::X64: {
|
||||
case EditorExportPlatformUWP::X64: {
|
||||
r_features->push_back("64");
|
||||
} break;
|
||||
}
|
||||
@@ -1123,13 +1123,13 @@ public:
|
||||
String platform_infix;
|
||||
|
||||
switch (arch) {
|
||||
case EditorExportUWP::ARM: {
|
||||
case EditorExportPlatformUWP::ARM: {
|
||||
platform_infix = "arm";
|
||||
} break;
|
||||
case EditorExportUWP::X86: {
|
||||
case EditorExportPlatformUWP::X86: {
|
||||
platform_infix = "x86";
|
||||
} break;
|
||||
case EditorExportUWP::X64: {
|
||||
case EditorExportPlatformUWP::X64: {
|
||||
platform_infix = "x64";
|
||||
} break;
|
||||
}
|
||||
@@ -1459,7 +1459,7 @@ public:
|
||||
virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) {
|
||||
}
|
||||
|
||||
EditorExportUWP() {
|
||||
EditorExportPlatformUWP() {
|
||||
Ref<Image> img = memnew(Image(_uwp_logo));
|
||||
logo.instance();
|
||||
logo->create_from_image(img);
|
||||
@@ -1478,7 +1478,7 @@ void register_uwp_exporter() {
|
||||
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "export/uwp/debug_algorithm", PROPERTY_HINT_ENUM, "MD5,SHA1,SHA256"));
|
||||
#endif // WINDOWS_ENABLED
|
||||
|
||||
Ref<EditorExportUWP> exporter;
|
||||
Ref<EditorExportPlatformUWP> exporter;
|
||||
exporter.instance();
|
||||
EditorExport::get_singleton()->add_export_platform(exporter);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user