From c92a997f11381e99beddede783337fc9d109b257 Mon Sep 17 00:00:00 2001
From: drhilarius <davediff@live.com>
Date: Thu, 16 May 2019 03:05:16 -0700
Subject: [PATCH] Fixes for cmake + msvc

Also now builds .asm file for dynarec jit with msvc
---
 CMakeLists.txt           | 2 ++
 core/rend/gui.cpp        | 2 +-
 shell/cmake/config.cmake | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80342e0d2..b4ccfb012 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ set(TNAME reicast)
 project(${TNAME})
 
 enable_language(ASM)
+enable_language(ASM_MASM)
 
 set(DEBUG_CMAKE ON)
 
@@ -177,6 +178,7 @@ list(APPEND osd_SRCS ${d_aout}/audiostream.cpp)
 if (${HOST_OS} EQUAL ${OS_WINDOWS})
 
   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)
   
   
diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp
index b6f0b30aa..4feec179b 100644
--- a/core/rend/gui.cpp
+++ b/core/rend/gui.cpp
@@ -1112,7 +1112,7 @@ static void gui_display_settings()
 						std::string cur = check ? "1" : "0";
 						(*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))
 						{
diff --git a/shell/cmake/config.cmake b/shell/cmake/config.cmake
index d1dfd59e4..da6b9fa44 100644
--- a/shell/cmake/config.cmake
+++ b/shell/cmake/config.cmake
@@ -270,10 +270,6 @@ endif()
 if ((${BUILD_COMPILER} EQUAL ${COMPILER_VC}) OR
 	(${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)