diff --git a/Common/Arm64Emitter.cpp b/Common/Arm64Emitter.cpp
index abf9747601..3a18a308a2 100644
--- a/Common/Arm64Emitter.cpp
+++ b/Common/Arm64Emitter.cpp
@@ -327,9 +327,7 @@ void ARM64XEmitter::FlushIcacheSection(u8* start, u8* end)
// Header file says this is equivalent to: sys_icache_invalidate(start, end - start);
sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
#elif PPSSPP_PLATFORM(WINDOWS)
-#if !PPSSPP_PLATFORM(UWP) // Not available on UWP, which is very bad!
FlushInstructionCache(GetCurrentProcess(), start, end - start);
-#endif
#elif PPSSPP_ARCH(ARM64)
// Code from Dolphin, contributed by the Mono project.
diff --git a/Common/ArmEmitter.cpp b/Common/ArmEmitter.cpp
index 1321bf28be..8626cdc434 100644
--- a/Common/ArmEmitter.cpp
+++ b/Common/ArmEmitter.cpp
@@ -633,9 +633,7 @@ void ARMXEmitter::FlushIcacheSection(u8 *start, u8 *end)
// Header file says this is equivalent to: sys_icache_invalidate(start, end - start);
sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
#elif PPSSPP_PLATFORM(WINDOWS)
-#if !PPSSPP_PLATFORM(UWP) // Not available on UWP, which is very bad!
FlushInstructionCache(GetCurrentProcess(), start, end - start);
-#endif
#elif PPSSPP_ARCH(ARM)
#if defined(__clang__) || defined(__ANDROID__)
diff --git a/Core/Config.cpp b/Core/Config.cpp
index f89d75f738..cf38a3c788 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -713,8 +713,8 @@ static ConfigSetting controlSettings[] = {
ConfigSetting("UseMouse", &g_Config.bMouseControl, false, true, true),
ConfigSetting("MapMouse", &g_Config.bMapMouse, false, true, true),
ConfigSetting("ConfineMap", &g_Config.bMouseConfine, false, true, true),
- ConfigSetting("MouseSensitivity", &g_Config.fMouseSensitivity, 0.1, true, true),
- ConfigSetting("MouseSmoothing", &g_Config.fMouseSmoothing, 0.9, true, true),
+ ConfigSetting("MouseSensitivity", &g_Config.fMouseSensitivity, 0.1f, true, true),
+ ConfigSetting("MouseSmoothing", &g_Config.fMouseSmoothing, 0.9f, true, true),
ConfigSetting(false),
};
diff --git a/Core/FileSystems/BlobFileSystem.cpp b/Core/FileSystems/BlobFileSystem.cpp
index b0a7639b39..27b4113aa3 100644
--- a/Core/FileSystems/BlobFileSystem.cpp
+++ b/Core/FileSystems/BlobFileSystem.cpp
@@ -50,7 +50,7 @@ void BlobFileSystem::CloseFile(u32 handle) {
size_t BlobFileSystem::ReadFile(u32 handle, u8 *pointer, s64 size) {
auto entry = entries_.find(handle);
if (entry != entries_.end()) {
- s64 readSize = fileLoader_->ReadAt(entry->second, size, pointer);
+ s64 readSize = (s64)fileLoader_->ReadAt(entry->second, (size_t)size, pointer);
entry->second += readSize;
return (size_t)readSize;
}
diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp
index ca617d5b90..ee636a89fe 100644
--- a/Core/HW/StereoResampler.cpp
+++ b/Core/HW/StereoResampler.cpp
@@ -78,6 +78,7 @@ StereoResampler::StereoResampler()
StereoResampler::~StereoResampler() {
delete[] m_buffer;
+ m_buffer = nullptr;
}
void StereoResampler::UpdateBufferSize() {
diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp
index 050cef8025..5ded4af630 100644
--- a/Core/MIPS/ARM/ArmJit.cpp
+++ b/Core/MIPS/ARM/ArmJit.cpp
@@ -179,20 +179,10 @@ void ArmJit::CompileDelaySlot(int flags)
_MSR(true, false, R8); // Restore flags register
}
-
void ArmJit::Compile(u32 em_address) {
PROFILE_THIS_SCOPE("jitc");
-#if PPSSPP_PLATFORM(UWP)
// INFO_LOG(JIT, "Compiling at %08x", em_address);
- // Unfortunately Microsoft forgot to expose FlushInstructionCache to UWP applications... even though they expose
- // the ability to generate code :( This works great on x86 but on ARM we're out of luck.
- // This seems to be enough to flush the instruction cache:
- // If this OutputDebugStringUTF8 is not called, we crash.
- // But it only helps if the debugger is attached :( If not, we still crash.
- // So really, the JIT is broken on Windows UWP ARM.
- OutputDebugStringUTF8("JITHACK");
-#endif
if (GetSpaceLeft() < 0x10000 || blocks.IsFull()) {
ClearCache();
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj
index 828b6b150d..ac94b54c2e 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj
index b4e4bb6ea9..2211777fa4 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj
+++ b/UWP/CoreUWP/CoreUWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
diff --git a/UWP/GPU_UWP/GPU_UWP.vcxproj b/UWP/GPU_UWP/GPU_UWP.vcxproj
index 838205b571..0d1bc445ea 100644
--- a/UWP/GPU_UWP/GPU_UWP.vcxproj
+++ b/UWP/GPU_UWP/GPU_UWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj
index 599d491e0c..e6e8d6a89f 100644
--- a/UWP/NativeUWP/NativeUWP.vcxproj
+++ b/UWP/NativeUWP/NativeUWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
diff --git a/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj b/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj
index d36a6fec45..8e4ac9dfc2 100644
--- a/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj
+++ b/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
diff --git a/UWP/UI_UWP/UI_UWP.vcxproj b/UWP/UI_UWP/UI_UWP.vcxproj
index 377dff98d5..7fda5b55f9 100644
--- a/UWP/UI_UWP/UI_UWP.vcxproj
+++ b/UWP/UI_UWP/UI_UWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj
index 16f370ea04..4f6ef42475 100644
--- a/UWP/UWP.vcxproj
+++ b/UWP/UWP.vcxproj
@@ -46,10 +46,10 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
PPSSPP_UWP
- 10.0.15063.0
+ 10.0.16299.0
@@ -117,39 +117,39 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -490,7 +490,7 @@ copy AssetsGold\*.* Assets /Y
-
+
diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj b/UWP/glslang_UWP/glslang_UWP.vcxproj
index a4b35f9bcd..841a94fd24 100644
--- a/UWP/glslang_UWP/glslang_UWP.vcxproj
+++ b/UWP/glslang_UWP/glslang_UWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
@@ -302,6 +302,7 @@
+
@@ -347,6 +348,7 @@
+
@@ -403,4 +405,4 @@
-
+
\ No newline at end of file
diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj.filters b/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
index 443bf3bd7d..9d3fc6da3c 100644
--- a/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
+++ b/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
@@ -160,6 +160,9 @@
OGLCompilersDLL
+
+ glslang\MachineIndependent
+
@@ -317,5 +320,8 @@
OGLCompilersDLL
+
+ glslang\MachineIndependent
+
-
+
\ No newline at end of file
diff --git a/UWP/libkirk_UWP/libkirk_UWP.vcxproj b/UWP/libkirk_UWP/libkirk_UWP.vcxproj
index 49ecaec065..d993e1145e 100644
--- a/UWP/libkirk_UWP/libkirk_UWP.vcxproj
+++ b/UWP/libkirk_UWP/libkirk_UWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0
diff --git a/UWP/zlib_UWP/zlib_UWP.vcxproj b/UWP/zlib_UWP/zlib_UWP.vcxproj
index ce7b30285c..347bd1ea74 100644
--- a/UWP/zlib_UWP/zlib_UWP.vcxproj
+++ b/UWP/zlib_UWP/zlib_UWP.vcxproj
@@ -46,9 +46,9 @@
14.0
true
Windows Store
- 10.0.10240.0
+ 10.0.14393.0
10.0
- 10.0.15063.0
+ 10.0.16299.0