mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
CMake: Correct build on Windows.
This commit is contained in:
1 parent
af3b0e6ebf
commit
5109fd7cdc
7 files changed
+8
-26
No files matched your search
@@ -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
|
||||
|
||||
@@ -434,6 +434,9 @@ void SoftwareTessellation(OutputBuffers &output, const Surface &surface, u32 ori
|
||||
SubdivisionSurface<Surface>::Tessellate(output, surface, points, weights, origVertType);
|
||||
}
|
||||
|
||||
template void SoftwareTessellation<BezierSurface>(OutputBuffers &output, const BezierSurface &surface, u32 origVertType, const ControlPoints &points);
|
||||
template void SoftwareTessellation<SplineSurface>(OutputBuffers &output, const SplineSurface &surface, u32 origVertType, const ControlPoints &points);
|
||||
|
||||
template<class Surface>
|
||||
static void HardwareTessellation(OutputBuffers &output, const Surface &surface, u32 origVertType,
|
||||
const SimpleVertex *const *points, TessellationDataTransfer *tessDataTransfer) {
|
||||
|
||||
@@ -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 //////////////////////////////////////////////////////////////////////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -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
|
||||
@@ -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 <WindowsX.h>
|
||||
#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";
|
||||
|
||||
@@ -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[] =
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user