Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-03 17:39:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix includes and build.

Browse Source
This commit is contained in:
Relintai 2023-10-02 18:30:49 +02:00
parent f25a340e43
commit 83799f5cf5
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/uwp/context_egl_uwp.h
View File

@ -35,7 +35,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include "core/error_list.h" #include "core/error/error_list.h"
#include "core/os/os.h" #include "core/os/os.h"
using namespace Windows::UI::Core; using namespace Windows::UI::Core;

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

@ -34,13 +34,17 @@
#include "core/crypto/crypto_core.h" #include "core/crypto/crypto_core.h"
#include "core/io/marshalls.h" #include "core/io/marshalls.h"
#include "core/io/zip_io.h" #include "core/io/zip_io.h"
#include "core/object.h" #include "core/object/object.h"
#include "core/os/dir_access.h" #include "core/os/dir_access.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#include "core/project_settings.h" #include "core/config/project_settings.h"
#include "core/version.h" #include "core/version.h"
#include "core/string/ustring.h"
#include "editor/editor_export.h" #include "editor/editor_export.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_settings.h"
#include "platform/uwp/logo.gen.h" #include "platform/uwp/logo.gen.h"
// Mono build doesn't support UWP, so we show a specific error. // Mono build doesn't support UWP, so we show a specific error.
@ -139,7 +143,7 @@ class AppxPackager {
String progress_task; String progress_task;
FileAccess *package; FileAccess *package;
Set<String> mime_types; RBSet<String> mime_types;
Vector<FileMeta> file_metadata; Vector<FileMeta> file_metadata;
@ -259,7 +263,7 @@ void AppxPackager::make_content_types(const String &p_path) {
tmp_file->store_string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); tmp_file->store_string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
tmp_file->store_string("<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">"); tmp_file->store_string("<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">");
Map<String, String> types; RBMap<String, String> types;
for (int i = 0; i < file_metadata.size(); i++) { for (int i = 0; i < file_metadata.size(); i++) {
String ext = file_metadata[i].name.get_extension().to_lower(); String ext = file_metadata[i].name.get_extension().to_lower();
@ -1558,7 +1562,7 @@ public:
r_features->push_back("UWP"); r_features->push_back("UWP");
} }
virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) { virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, RBSet<String> &p_features) {
} }
static Error copy_shared_objects(void *p_userdata, const SharedObject &p_so) { static Error copy_shared_objects(void *p_userdata, const SharedObject &p_so) {

7
platform/uwp/os_uwp.cpp
View File

@ -31,9 +31,8 @@
#include "os_uwp.h" #include "os_uwp.h"
#include "core/io/marshalls.h" #include "core/io/marshalls.h"
#include "core/project_settings.h" #include "core/config/project_settings.h"
#include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles2/rasterizer_gles2.h"
#include "drivers/gles3/rasterizer_gles3.h"
#include "drivers/unix/ip_unix.h" #include "drivers/unix/ip_unix.h"
#include "drivers/unix/net_socket_posix.h" #include "drivers/unix/net_socket_posix.h"
#include "drivers/windows/dir_access_windows.h" #include "drivers/windows/dir_access_windows.h"
@ -41,8 +40,8 @@
#include "main/main.h" #include "main/main.h"
#include "platform/windows/windows_terminal_logger.h" #include "platform/windows/windows_terminal_logger.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/visual_server_raster.h" #include "servers/rendering/rendering_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/rendering/rendering_server_wrap_mt.h"
#include <ppltasks.h> #include <ppltasks.h>
#include <wrl.h> #include <wrl.h>