Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix build with clang-cl

Browse source
This commit is contained in:
sorgts 2020-08-13 16:48:48 +02:00
parent 0ae12da3a7
commit a8a1c67df0
6 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -311,7 +311,9 @@ if(NOT MSVC)
else() else()
# Disable warnings about MS-specific _s variants of libc functions # Disable warnings about MS-specific _s variants of libc functions
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-MP) if (NOT CLANG)
add_compile_options(-MP)
endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG")
endif() endif()

2
Core/HLE/sceKernel.h
View file

@ -25,7 +25,7 @@
class PointerWrap; class PointerWrap;
enum { enum : u32 {
SCE_KERNEL_ERROR_OK = 0, SCE_KERNEL_ERROR_OK = 0,
SCE_KERNEL_ERROR_ALREADY = 0x80000020, SCE_KERNEL_ERROR_ALREADY = 0x80000020,
SCE_KERNEL_ERROR_BUSY = 0x80000021, SCE_KERNEL_ERROR_BUSY = 0x80000021,

2
Core/HLE/sceKernelModule.cpp
View file

@ -72,7 +72,7 @@ enum {
PSP_THREAD_ATTR_USER = 0x80000000, PSP_THREAD_ATTR_USER = 0x80000000,
}; };
enum { enum : u32 {
// Function exports. // Function exports.
NID_MODULE_START = 0xD632ACDB, NID_MODULE_START = 0xD632ACDB,
NID_MODULE_STOP = 0xCEE8593C, NID_MODULE_STOP = 0xCEE8593C,

2
Windows/InputDevice.cpp
View file

@ -27,7 +27,7 @@
static std::atomic_flag threadRunningFlag; static std::atomic_flag threadRunningFlag;
static std::thread inputThread; static std::thread inputThread;
static std::atomic_bool focused = true; static std::atomic_bool focused = ATOMIC_VAR_INIT(true);
inline static void ExecuteInputPoll() { inline static void ExecuteInputPoll() {
if (host && (focused.load(std::memory_order_relaxed) || !g_Config.bGamepadOnlyFocused)) { if (host && (focused.load(std::memory_order_relaxed) || !g_Config.bGamepadOnlyFocused)) {

BIN
Windows/aboutbox.rc
View file

Binary file not shown.

BIN
Windows/version.rc
View file

Binary file not shown.