diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index 02df902965..5901f1208c 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -28,25 +28,25 @@
StaticLibrary
true
Unicode
- v120_xp
+ v140_xp
StaticLibrary
true
Unicode
- v120_xp
+ v140_xp
StaticLibrary
false
Unicode
- v120_xp
+ v140_xp
StaticLibrary
false
Unicode
- v120_xp
+ v140_xp
@@ -289,4 +289,4 @@
-
+
\ No newline at end of file
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 36a3aee9c0..2bce532528 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -47,6 +47,7 @@
+
diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp
index f3244598e8..cfc380aa95 100644
--- a/Common/ConsoleListener.cpp
+++ b/Common/ConsoleListener.cpp
@@ -234,7 +234,7 @@ void ConsoleListener::BufferWidthHeight(int BufferWidth, int BufferHeight, int S
if (BufferFirst)
{
// Change screen buffer size
- COORD Co = {BufferWidth, BufferHeight};
+ COORD Co = {(SHORT)BufferWidth, (SHORT)BufferHeight};
SB = SetConsoleScreenBufferSize(hConsole, Co);
// Change the screen buffer window size
SMALL_RECT coo = {(SHORT)0, (SHORT)0, (SHORT)ScreenWidth, (SHORT)ScreenHeight}; // top, left, right, bottom
@@ -243,7 +243,7 @@ void ConsoleListener::BufferWidthHeight(int BufferWidth, int BufferHeight, int S
else
{
// Change the screen buffer window size
- SMALL_RECT coo = {0,0, ScreenWidth, ScreenHeight}; // top, left, right, bottom
+ SMALL_RECT coo = {(SHORT)0, (SHORT)0, (SHORT)ScreenWidth, (SHORT)ScreenHeight}; // top, left, right, bottom
SW = SetConsoleWindowInfo(hConsole, TRUE, &coo);
// Change screen buffer size
COORD Co = {(SHORT)BufferWidth, (SHORT)BufferHeight};
diff --git a/Common/MemoryUtil.cpp b/Common/MemoryUtil.cpp
index cf92f09492..b1d821e30d 100644
--- a/Common/MemoryUtil.cpp
+++ b/Common/MemoryUtil.cpp
@@ -42,7 +42,7 @@ int hint_location;
#define PAGE_MASK (4096-1)
#elif defined(_WIN32)
static SYSTEM_INFO sys_info;
-#define PAGE_MASK (sys_info.dwPageSize - 1)
+#define PAGE_MASK (uintptr_t)(sys_info.dwPageSize - 1)
#else
#define PAGE_MASK (getpagesize() - 1)
#endif
diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 0a7e0d49d2..2644e8be55 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -27,27 +27,27 @@
StaticLibrary
true
Unicode
- v120_xp
+ v140_xp
StaticLibrary
true
Unicode
- v120_xp
+ v140_xp
StaticLibrary
false
false
Unicode
- v120_xp
+ v140_xp
StaticLibrary
false
false
Unicode
- v120_xp
+ v140_xp
diff --git a/Core/Util/DisArm64.cpp b/Core/Util/DisArm64.cpp
index 09a1e98968..3eb5de9e74 100644
--- a/Core/Util/DisArm64.cpp
+++ b/Core/Util/DisArm64.cpp
@@ -153,7 +153,7 @@ static void DataProcessingImmediate(uint32_t w, uint64_t addr, Instruction *inst
int imm = (SignExtend19(w >> 5) << 2) | ((w >> 29) & 3);
if (op & 1) imm <<= 12;
u64 daddr = addr + imm;
- snprintf(instr->text, sizeof(instr->text), "%s x%d, #0x%04x%08x", op ? "adrp" : "adr", Rd, daddr >> 32, daddr & 0xFFFFFFFF);
+ snprintf(instr->text, sizeof(instr->text), "%s x%d, #0x%04x%08x", op ? "adrp" : "adr", Rd, (u32)(daddr >> 32), (u32)(daddr & 0xFFFFFFFF));
} else if (((w >> 24) & 0x1F) == 0x11) {
// Add/subtract immediate value
int op = (w >> 30) & 1;
@@ -175,7 +175,7 @@ static void DataProcessingImmediate(uint32_t w, uint64_t addr, Instruction *inst
uint64_t wmask;
DecodeBitMasks(N, imms, immr, NULL, &wmask);
if (((w >> 31) & 1) && wmask & 0xFFFFFFFF00000000ULL)
- snprintf(instr->text, sizeof(instr->text), "%s %c%d, %c%d, #0x%x%08x", opname[opc], r, Rd, r, Rn, (wmask >> 32), (wmask & 0xFFFFFFFF));
+ snprintf(instr->text, sizeof(instr->text), "%s %c%d, %c%d, #0x%x%08x", opname[opc], r, Rd, r, Rn, (uint32_t)(wmask >> 32), (uint32_t)(wmask & 0xFFFFFFFF));
else
snprintf(instr->text, sizeof(instr->text), "%s %c%d, %c%d, #0x%x", opname[opc], r, Rd, r, Rn, (uint32_t)wmask);
} else if (((w >> 23) & 0x3f) == 0x26) {
@@ -207,7 +207,7 @@ static void BranchExceptionAndSystem(uint32_t w, uint64_t addr, Instruction *ins
// Unconditional branch / branch+link
int offset = SignExtend26(w) << 2;
uint64_t target = addr + offset;
- snprintf(instr->text, sizeof(instr->text), "b%s %04x%08x", (w >> 31) ? "l" : "", (uint32_t)(target >> 32), (target & 0xFFFFFFFF));
+ snprintf(instr->text, sizeof(instr->text), "b%s %04x%08x", (w >> 31) ? "l" : "", (uint32_t)(target >> 32), (uint32_t)(target & 0xFFFFFFFF));
} else if (((w >> 25) & 0x3F) == 0x1A) {
// Compare and branch
int op = (w >> 24) & 1;
@@ -223,7 +223,7 @@ static void BranchExceptionAndSystem(uint32_t w, uint64_t addr, Instruction *ins
int offset = SignExtend19(w >> 5) << 2;
uint64_t target = addr + offset;
int cond = w & 0xF;
- snprintf(instr->text, sizeof(instr->text), "b.%s %04x%08x", condnames[cond], (uint32_t)(target >> 32), (target & 0xFFFFFFFF));
+ snprintf(instr->text, sizeof(instr->text), "b.%s %04x%08x", condnames[cond], (uint32_t)(target >> 32), (uint32_t)(target & 0xFFFFFFFF));
} else if ((w >> 24) == 0xD4) {
if (((w >> 21) & 0x7) == 1 && Rt == 0) {
int imm = (w >> 5) & 0xFFFF;
diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj
index 151c945a0d..ccbf958d6b 100644
--- a/GPU/GPU.vcxproj
+++ b/GPU/GPU.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -28,28 +28,28 @@
true
Unicode
false
- v120_xp
+ v140_xp
StaticLibrary
true
Unicode
false
- v120_xp
+ v140_xp
StaticLibrary
false
false
Unicode
- v120_xp
+ v140_xp
StaticLibrary
false
false
Unicode
- v120_xp
+ v140_xp
@@ -68,20 +68,20 @@
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x86;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(WindowsSDK_LibraryPath_x86)
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(WindowsSDK_LibraryPath_x64)
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(WindowsSDK_LibraryPath_x64)
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath);
- ..\dx9sdk\Lib\x86;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);
diff --git a/GPU/Software/Rasterizer.cpp b/GPU/Software/Rasterizer.cpp
index 150402bc7d..111530db4d 100644
--- a/GPU/Software/Rasterizer.cpp
+++ b/GPU/Software/Rasterizer.cpp
@@ -1344,7 +1344,8 @@ void DrawTriangle(const VertexData& v0, const VertexData& v1, const VertexData&
if (gstate.isModeClear()) {
if (range >= 24 && (maxX - minX) >= 24 * 16)
{
- auto bound = [=](int a, int b) -> void {DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); };
+ VertexData v[3] = { v0, v1, v2 };
+ auto bound = [&](int a, int b) -> void {DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); };
GlobalThreadPool::Loop(bound, 0, range);
}
else
@@ -1354,7 +1355,7 @@ void DrawTriangle(const VertexData& v0, const VertexData& v1, const VertexData&
} else {
if (range >= 24 && (maxX - minX) >= 24 * 16)
{
- auto bound = [=](int a, int b) -> void {DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); };
+ auto bound = [&](int a, int b) -> void {DrawTriangleSlice(v0, v1, v2, minX, minY, maxX, maxY, a, b); };
GlobalThreadPool::Loop(bound, 0, range);
}
else
diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj
index d9fccb6c3d..4333d5c889 100644
--- a/UI/UI.vcxproj
+++ b/UI/UI.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -76,26 +76,26 @@
StaticLibrary
true
- v120_xp
+ v140_xp
Unicode
StaticLibrary
true
- v120_xp
+ v140_xp
Unicode
StaticLibrary
false
- v120_xp
+ v140_xp
false
Unicode
StaticLibrary
false
- v120_xp
+ v140_xp
false
Unicode
diff --git a/Windows/D3D9Base.cpp b/Windows/D3D9Base.cpp
index 9733f9fa19..8110576b3a 100644
--- a/Windows/D3D9Base.cpp
+++ b/Windows/D3D9Base.cpp
@@ -213,8 +213,9 @@ void D3D9_Resize(HWND window) {
pp.BackBufferHeight = yres;
HRESULT hr = device->Reset(&pp);
if (FAILED(hr)) {
- ERROR_LOG_REPORT(G3D, "Unable to reset device: %s", DXGetErrorStringA(hr));
- PanicAlert("Unable to reset D3D9 device: %s", DXGetErrorStringA(hr));
+ // Had to remove DXGetErrorStringA calls here because dxerr.lib is deprecated and will not link with VS 2015.
+ ERROR_LOG_REPORT(G3D, "Unable to reset D3D device");
+ PanicAlert("Unable to reset D3D9 device");
}
DX9::fbo_init(d3d);
}
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index b7a918962c..37135c38da 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -29,23 +29,23 @@
Application
Unicode
false
- v120_xp
+ v140_xp
Application
Unicode
- v120_xp
+ v140_xp
Application
Unicode
false
- v120_xp
+ v140_xp
Application
Unicode
- v120_xp
+ v140_xp
@@ -96,26 +96,26 @@
..\
PPSSPPDebug
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath);
- ..\dx9sdk\Lib\x86;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(WindowsSDK_LibraryPath_x86);
false
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);
PPSSPPDebug64
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(WindowsSDK_LibraryPath_x64)
false
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);
PPSSPPWindows64
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(WindowsSDK_LibraryPath_x64)
false
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x86;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(WindowsSDK_LibraryPath_x86)
false
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);
diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj
index 76b17308dd..b86bda9fa8 100644
--- a/ext/libarmips.vcxproj
+++ b/ext/libarmips.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -30,43 +30,44 @@
{129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}
Win32Proj
libarmips
+ 8.1
StaticLibrary
true
- v120
+ v140_xp
Unicode
StaticLibrary
true
- v120
+ v140_xp
Unicode
StaticLibrary
true
- v120
+ v140_xp
Unicode
StaticLibrary
true
- v120
+ v140_xp
Unicode
StaticLibrary
false
- v120
+ v140_xp
false
Unicode
StaticLibrary
false
- v120
+ v140_xp
false
Unicode
diff --git a/ext/libkirk/libkirk.vcxproj b/ext/libkirk/libkirk.vcxproj
index 9e409b6872..7c66ac3f0c 100644
--- a/ext/libkirk/libkirk.vcxproj
+++ b/ext/libkirk/libkirk.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -26,26 +26,26 @@
StaticLibrary
true
- v120_xp
+ v140_xp
Unicode
StaticLibrary
true
- v120_xp
+ v140_xp
Unicode
StaticLibrary
false
- v120_xp
+ v140_xp
false
Unicode
StaticLibrary
false
- v120_xp
+ v140_xp
false
Unicode
diff --git a/ext/zlib/zlib.vcxproj b/ext/zlib/zlib.vcxproj
index 00db184a8d..06dc80a86e 100644
--- a/ext/zlib/zlib.vcxproj
+++ b/ext/zlib/zlib.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -58,27 +58,27 @@
StaticLibrary
true
Unicode
- v120_xp
+ v140_xp
StaticLibrary
true
Unicode
- v120_xp
+ v140_xp
StaticLibrary
false
false
Unicode
- v120_xp
+ v140_xp
StaticLibrary
false
false
Unicode
- v120_xp
+ v140_xp
diff --git a/ffmpeg b/ffmpeg
index 7b0a230df5..ebb6ef2356 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 7b0a230df520c232bf608e3b21aa1f2bea2f0098
+Subproject commit ebb6ef2356451ee49971735bdfd98a670e2499a9
diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj
index 0a4c468699..8c4e6231cd 100644
--- a/headless/Headless.vcxproj
+++ b/headless/Headless.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -29,27 +29,27 @@
Application
true
Unicode
- v120_xp
+ v140_xp
Application
true
Unicode
- v120_xp
+ v140_xp
Application
false
false
Unicode
- v120_xp
+ v140_xp
Application
false
false
Unicode
- v120_xp
+ v140_xp
@@ -69,23 +69,23 @@
true
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath);
- ..\dx9sdk\Lib\x86;D:\Dev\LIB;C:\DXSDK\Lib\x86;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(WindowsSDK_LibraryPath_x86);
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);
true
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(WindowsSDK_LibraryPath_x64)
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);
false
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x86;D:\Dev\LIB;C:\DXSDK\Lib\x86;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(WindowsSDK_LibraryPath_x86)
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);
false
- ..\dx9sdk\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(WindowsSDK_IncludePath)
- ..\dx9sdk\Lib\x64;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(WindowsSDK_LibraryPath_x64)
+ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);
+ ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);
diff --git a/native b/native
index 18ce2262d6..54edf7b511 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 18ce2262d6f93aa3715190aeb6e31b00e0eab2d4
+Subproject commit 54edf7b5116fec2dd89dc0e07a3928bfda7d0faf
diff --git a/pspautotests b/pspautotests
index 2a51c58d9d..905c3018d0 160000
--- a/pspautotests
+++ b/pspautotests
@@ -1 +1 @@
-Subproject commit 2a51c58d9d17b8e5b37d1468c93ce33f9be8954d
+Subproject commit 905c3018d01af9dfb511c87e65e07a49257a33ac
diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj
index 24950005ce..6995756ccb 100644
--- a/unittest/UnitTests.vcxproj
+++ b/unittest/UnitTests.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -28,26 +28,26 @@
Application
true
- v120_xp
+ v140_xp
Unicode
Application
true
- v120_xp
+ v140_xp
Unicode
Application
false
- v120_xp
+ v140_xp
false
Unicode
Application
false
- v120_xp
+ v140_xp
false
Unicode