ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1606 from reicast/dd/cmake-msvc-fixes 

Fixes for cmake + msvc
This commit is contained in:
flyinghead 2019-05-16 18:40:08 +02:00 committed by GitHub
parent e44f98cf8b c92a997f11
commit 37d95e9fea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -5,6 +5,7 @@ set(TNAME reicast)
project(${TNAME}) project(${TNAME})
enable_language(ASM) enable_language(ASM)
enable_language(ASM_MASM)
set(DEBUG_CMAKE ON) set(DEBUG_CMAKE ON)
@ -177,6 +178,7 @@ list(APPEND osd_SRCS ${d_aout}/audiostream.cpp)
if (${HOST_OS} EQUAL ${OS_WINDOWS}) if (${HOST_OS} EQUAL ${OS_WINDOWS})
list(APPEND osd_SRCS ${d_core}/windows/winmain.cpp) list(APPEND osd_SRCS ${d_core}/windows/winmain.cpp)
list(APPEND osd_SRCS ${d_core}/windows/win_vmem.cpp)
list(APPEND osd_SRCS ${d_aout}/audiobackend_directsound.cpp) list(APPEND osd_SRCS ${d_aout}/audiobackend_directsound.cpp)

2
core/rend/gui.cpp
View File

@ -1112,7 +1112,7 @@ static void gui_display_settings()
std::string cur = check ? "1" : "0"; std::string cur = check ? "1" : "0";
(*cfg_entries)[options->cfg_name] = cur; (*cfg_entries)[options->cfg_name] = cur;
} }
else if (options->type == list) else if (options->type == ::list)
{ {
if (ImGui::BeginCombo(options->caption.c_str(), value.c_str(), ImGuiComboFlags_None)) if (ImGui::BeginCombo(options->caption.c_str(), value.c_str(), ImGuiComboFlags_None))
{ {

4
shell/cmake/config.cmake
View File

@ -270,10 +270,6 @@ endif()
if ((${BUILD_COMPILER} EQUAL ${COMPILER_VC}) OR if ((${BUILD_COMPILER} EQUAL ${COMPILER_VC}) OR
(${BUILD_COMPILER} EQUAL ${COMPILER_CLANG}) AND (${HOST_OS} STREQUAL ${OS_WINDOWS})) (${BUILD_COMPILER} EQUAL ${COMPILER_CLANG}) AND (${HOST_OS} STREQUAL ${OS_WINDOWS}))
if((${HOST_CPU} EQUAL ${CPU_X64}) AND (${FEAT_SHREC} EQUAL ${DYNAREC_JIT})) # AND NOT "${NINJA}" STREQUAL "")
set(FEAT_SHREC ${DYNAREC_CPP})
message("---x64 rec disabled for VC x64 via NINJA")
endif()
add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1) add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1)