Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 15:32:45 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

some C++14 features are not supported by VS2013. VS2015 is free for home use so no need for legacy support (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-08-27 11:15:38 +02:00
parent 0137c5b6a5
commit 62fe8b8980
9 changed files with 3 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
makefile
View File

@ -998,31 +998,6 @@ windows_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-mingw-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
#-------------------------------------------------
# Visual Studio 2013
#-------------------------------------------------
.PHONY: vs2013
vs2013: generate
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2013
ifdef MSBUILD
$(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2013/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
.PHONY: vs2013_intel
vs2013_intel: generate
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2013
ifdef MSBUILD
$(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2013-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
.PHONY: vs2013_xp
vs2013_xp: generate
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2013-xp vs2013
ifdef MSBUILD
$(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2013-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
#-------------------------------------------------
# Visual Studio 2015
#-------------------------------------------------

2
scripts/genie.lua
View File

@ -486,7 +486,7 @@ configuration { "Release", "vs*" }
"Optimize",
}
-- Force VS2013/15 targets to use bundled SDL2
-- Force VS2015 targets to use bundled SDL2
if string.sub(_ACTION,1,4) == "vs20" and _OPTIONS["osd"]=="sdl" then
if _OPTIONS["with-bundled-sdl2"]==nil then
_OPTIONS["with-bundled-sdl2"] = "1"

5
scripts/src/3rdparty.lua
View File

@ -1043,11 +1043,6 @@ project "uv"
"WIN32_LEAN_AND_MEAN",
"_WIN32_WINNT=0x0502",
}
if _ACTION == "vs2013" then
files {
MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c",
}
end
configuration { }
files {
MAME_DIR .. "3rdparty/libuv/src/win/async.c",

9
scripts/toolchain.lua
View File

@ -49,9 +49,7 @@ newoption {
allowed = {
{ "intel-14", "Intel C++ Compiler XE 14.0" },
{ "intel-15", "Intel C++ Compiler XE 15.0" },
{ "vs2013-clang", "Clang 3.6" },
{ "vs2015-clang", "Clang 3.6" },
{ "vs2013-xp", "Visual Studio 2013 targeting XP" },
{ "vs2015-xp", "Visual Studio 2015 targeting XP" },
{ "winphone8", "Windows Phone 8.0" },
{ "winphone81", "Windows Phone 8.1" },
@ -333,7 +331,7 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20")
end
elseif _ACTION == "vs2013" or _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then
elseif _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("LLVM-" .. _ACTION)
@ -384,11 +382,6 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
end
if ("vs2013-xp") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("v120_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
end
if ("vs2015-xp") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("v140_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")

2
src/devices/cpu/m68000/m68kmake.cpp
View File

@ -70,7 +70,7 @@ static const char g_version[] = "4.90";
#define ATTR_NORETURN __attribute__((noreturn))
#else
#define ATTR_PRINTF(x,y)
#if defined(_MSC_VER) && (_MSC_VER >= 1200)
#if defined(_MSC_VER)
#define ATTR_NORETURN __declspec(noreturn)
#else
#define ATTR_NORETURN

5
src/lib/formats/cassimg.cpp
View File

@ -35,12 +35,7 @@ CASSETTE_FORMATLIST_END
static double map_double(double d, UINT64 low, UINT64 high, UINT64 value)
{
#if defined(_MSC_VER) && (_MSC_VER <= 1200)
/* casting unsigned __int64 to double is not supported on VC6 or before */
return d * (INT64)(value - low) / (INT64)(high - low);
#else
return d * (value - low) / (high - low);
#endif
}

5
src/lib/util/coretmpl.h
View File

@ -18,11 +18,6 @@
#include <vector>
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#include <yvals.h>
#define noexcept _NOEXCEPT
#endif
// TEMPORARY helper to catch is_pod assertions in the debugger
#if 0
#undef assert

14
src/osd/eivc.h
View File

@ -11,21 +11,7 @@
#ifndef __EIVC__
#define __EIVC__
#if (_MSC_VER >= 1400)
// need to ignore 'nonstandard extension used' warning in setjmp.h
#pragma warning(push)
#pragma warning(disable: 4987)
#include <intrin.h>
#pragma warning(pop)
#else
extern "C" unsigned char _BitScanReverse(unsigned long *Index, unsigned long Mask);
#endif
#if (_MSC_VER >= 1310)
#pragma intrinsic(_BitScanReverse)
#endif
/***************************************************************************

7
src/osd/osdcomm.h
View File

@ -167,16 +167,9 @@ constexpr UINT64 little_endianize_int64(UINT64 x) { return flipendian_int64(x);
#ifdef _MSC_VER
#include <malloc.h>
using ssize_t = std::make_signed_t<size_t>;
#if _MSC_VER == 1900 // VS2015
#define __LINE__Var 0
#endif // VS2015
#if _MSC_VER < 1900 // VS2013 or earlier
#define snprintf _snprintf
#define __func__ __FUNCTION__
#else // VS2015
#define _CRT_STDIO_LEGACY_WIDE_SPECIFIERS
#endif
#endif
#ifdef __GNUC__
#ifndef alloca