From 5109fd7cdc5d73ae115377f583bfe189e24c6472 Mon Sep 17 00:00:00 2001 From: Kingcom Date: Fri, 12 Feb 2021 07:37:46 -0800 Subject: [PATCH] CMake: Correct build on Windows. --- CMakeLists.txt | 4 ---- GPU/Common/SplineCommon.cpp | 3 +++ Windows/Debugger/Debugger_Misc.cpp | 10 ---------- Windows/Debugger/Debugger_Misc.h | 12 ------------ Windows/GEDebugger/SimpleGLWindow.cpp | 2 ++ Windows/GEDebugger/VertexPreview.cpp | 1 + Windows/stdafx.h | 2 ++ 7 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 Windows/Debugger/Debugger_Misc.cpp delete mode 100644 Windows/Debugger/Debugger_Misc.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f3618f74c5..36b17ef68c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1332,8 +1332,6 @@ set(GPU_D3D9 GPU/Directx9/TextureCacheDX9.h GPU/Directx9/TextureScalerDX9.cpp GPU/Directx9/TextureScalerDX9.h - GPU/Directx9/VertexShaderGeneratorHLSL.cpp - GPU/GLES/VertexShaderGeneratorGLES.h ) set(GPU_D3D11 @@ -1977,8 +1975,6 @@ set(WindowsFiles Windows/Debugger/Debugger_MemoryDlg.h Windows/Debugger/Debugger_Lists.cpp Windows/Debugger/Debugger_Lists.h - Windows/Debugger/Debugger_Misc.cpp - Windows/Debugger/Debugger_Misc.h Windows/Debugger/Debugger_SymbolMap.h Windows/Debugger/Debugger_VFPUDlg.cpp Windows/Debugger/Debugger_VFPUDlg.h diff --git a/GPU/Common/SplineCommon.cpp b/GPU/Common/SplineCommon.cpp index c4aa0d2c49..86226907f0 100644 --- a/GPU/Common/SplineCommon.cpp +++ b/GPU/Common/SplineCommon.cpp @@ -434,6 +434,9 @@ void SoftwareTessellation(OutputBuffers &output, const Surface &surface, u32 ori SubdivisionSurface::Tessellate(output, surface, points, weights, origVertType); } +template void SoftwareTessellation(OutputBuffers &output, const BezierSurface &surface, u32 origVertType, const ControlPoints &points); +template void SoftwareTessellation(OutputBuffers &output, const SplineSurface &surface, u32 origVertType, const ControlPoints &points); + template static void HardwareTessellation(OutputBuffers &output, const Surface &surface, u32 origVertType, const SimpleVertex *const *points, TessellationDataTransfer *tessDataTransfer) { diff --git a/Windows/Debugger/Debugger_Misc.cpp b/Windows/Debugger/Debugger_Misc.cpp deleted file mode 100644 index 60655866ed..0000000000 --- a/Windows/Debugger/Debugger_Misc.cpp +++ /dev/null @@ -1,10 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////////////////////// -// M O D U L E B E G I N /////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" - -///////////////////////////////////////////////////////////////////////////////////////////////////// -// I M P L E M E N T A T I O N ////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////// - diff --git a/Windows/Debugger/Debugger_Misc.h b/Windows/Debugger/Debugger_Misc.h deleted file mode 100644 index c7c5216a64..0000000000 --- a/Windows/Debugger/Debugger_Misc.h +++ /dev/null @@ -1,12 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////////////////////////// -// M O D U L E B E G I N /////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifndef _DEBUGMISC_H -#define _DEBUGMISC_H - -///////////////////////////////////////////////////////////////////////////////////////////////////// -// E X T E R N A L ////////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////// - -#endif \ No newline at end of file diff --git a/Windows/GEDebugger/SimpleGLWindow.cpp b/Windows/GEDebugger/SimpleGLWindow.cpp index f27cfeadc8..a155b477e7 100644 --- a/Windows/GEDebugger/SimpleGLWindow.cpp +++ b/Windows/GEDebugger/SimpleGLWindow.cpp @@ -15,11 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include "Common/CommonWindows.h" #include #include "Common/Math/lin/matrix4x4.h" #include "Common/GPU/OpenGL/GLSLProgram.h" #include "Common/GPU/OpenGL/GLFeatures.h" #include "Common/Common.h" +#include "Common/Log.h" #include "Windows/GEDebugger/SimpleGLWindow.h" const wchar_t *SimpleGLWindow::windowClass = L"SimpleGLWindow"; diff --git a/Windows/GEDebugger/VertexPreview.cpp b/Windows/GEDebugger/VertexPreview.cpp index cc3589eebc..fc28690abd 100644 --- a/Windows/GEDebugger/VertexPreview.cpp +++ b/Windows/GEDebugger/VertexPreview.cpp @@ -26,6 +26,7 @@ #include "GPU/Common/GPUDebugInterface.h" #include "GPU/Common/SplineCommon.h" #include "GPU/GPUState.h" +#include "Common/Log.h" #include "Common/MemoryUtil.h" static const char preview_fs[] = diff --git a/Windows/stdafx.h b/Windows/stdafx.h index a7f4a49287..e0bd6aa90c 100644 --- a/Windows/stdafx.h +++ b/Windows/stdafx.h @@ -36,6 +36,7 @@ #undef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 +#ifndef __clang__ #if defined _M_IX86 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") #elif defined _M_X64 @@ -43,6 +44,7 @@ #else #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") #endif +#endif #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN