Previous 199869 Revisions Next

r41721 Saturday 14th November, 2015 at 10:52:15 UTC by Miodrag Milanović
Fix compile for Intel C++ 15 compiler (nw)
[/trunk]makefile
[scripts]genie.lua
[scripts/src]3rdparty.lua
[src/devices/cpu/dsp56k]dsp56mem.h
[src/devices/cpu/i86]i286.cpp

trunk/makefile
r250232r250233
846846vs2015: generate
847847   $(SILENT) $(GENIE) $(PARAMS) vs2015
848848
849vs2015_intel: generate
850   $(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2015
851
852vs2015_xp: generate
853   $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2015
854
855vs2015_clang: generate
856   $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2015
857
858vs2015_winrt: generate
859   $(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2015
860
849861android-arm: generate
850862ifndef ANDROID_NDK_ARM
851863   $(error ANDROID_NDK_ARM is not set)
trunk/scripts/genie.lua
r250232r250233
12541254         "/Qwd1478",          -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
12551255         "/Qwd1879",          -- warning #1879: unimplemented pragma ignored
12561256         "/Qwd3291",          -- warning #3291: invalid narrowing conversion from "double" to "int"
1257         "/Qwd1195",
1258         "/Qwd1786",
1259         "/Qwd592", -- For lua, false positive?
1257         "/Qwd1195",          -- error #1195: conversion from integer to smaller pointer
1258         "/Qwd47",            -- error #47: incompatible redefinition of macro "xxx"
1259         "/Qwd265",            -- error #265: floating-point operation result is out of range
12601260      }
12611261end
12621262
trunk/scripts/src/3rdparty.lua
r250232r250233
1616         "/wd4127", -- warning C4127: conditional expression is constant
1717         "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
1818      }
19if _OPTIONS["vs"]=="intel-15" then
20      buildoptions {
21         "/Qwd111",           -- remark #111: statement is unreachable
22         "/Qwd1879",          -- warning #1879: unimplemented pragma ignored
23         "/Qwd2557",          -- remark #2557: comparison between signed and unsigned operands
24         "/Qwd869",           -- remark #869: parameter "xxx" was never referenced
25      }
26end
1927   configuration { "vs2015" }
2028      buildoptions {
2129         "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
r250232r250233
4856         "/wd4127", -- warning C4127: conditional expression is constant
4957         "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
5058      }
51
59if _OPTIONS["vs"]=="intel-15" then
60      buildoptions {
61         "/Qwd111",           -- remark #111: statement is unreachable
62         "/Qwd280",           -- remark #280: selector expression is constant
63      }
64end
5265   configuration "Debug"
5366      defines {
5467         "verbose=-1",
r250232r250233
98111   includedirs {
99112      MAME_DIR .. "src/osd",
100113   }
101   
114if _OPTIONS["vs"]=="intel-15" then
115      buildoptions {
116         "/Qwd2557",          -- remark #2557: comparison between signed and unsigned operands
117      }
118end   
102119   files {
103120      MAME_DIR .. "3rdparty/softfloat/softfloat.c",
104121      MAME_DIR .. "3rdparty/softfloat/fsincos.c",
r250232r250233
120137         "/wd4127", -- warning C4127: conditional expression is constant
121138         "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
122139      }
140if _OPTIONS["vs"]=="intel-15" then
141      buildoptions {
142         "/Qwd869",           -- remark #869: parameter "xxx" was never referenced
143      }
144end   
123145
124146   configuration { }
125147
r250232r250233
193215         "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter   
194216         "/wd4702", -- warning C4702: unreachable code
195217      }
218if _OPTIONS["vs"]=="intel-15" then
219      buildoptions {
220         "/Qwd111",           -- remark #111: statement is unreachable
221         "/Qwd177",           -- remark #177: function "xxx" was declared but never referenced
222         "/Qwd181",           -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
223         "/Qwd188",           -- error #188: enumerated type mixed with another type
224         "/Qwd869",           -- remark #869: parameter "xxx" was never referenced
225      }
226end   
196227
197228   configuration { "vs2015" }
198229      buildoptions {
r250232r250233
261292      buildoptions {
262293         "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
263294      }
295if _OPTIONS["vs"]=="intel-15" then
296      buildoptions {
297         "/Qwd869",           -- remark #869: parameter "xxx" was never referenced
298      }
299end
264300   configuration { "vs2015" }
265301      buildoptions {
266302         "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
r250232r250233
318354         "/wd4702", -- warning C4702: unreachable code
319355         "/wd4310", -- warning C4310: cast truncates constant value
320356      }
321
357if _OPTIONS["vs"]=="intel-15" then
358      buildoptions {
359         "/Qwd592", -- error #592: variable "xxx" is used before its value is set
360      }
361end
322362   configuration { }
323363      defines {
324364         "LUA_COMPAT_ALL",
r250232r250233
459499         "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
460500         "/wd4706", -- warning C4706: assignment within conditional expression
461501      }
502if _OPTIONS["vs"]=="intel-15" then
503      buildoptions {
504         "/Qwd869",           -- remark #869: parameter "xxx" was never referenced
505         "/Qwd2557",          -- remark #2557: comparison between signed and unsigned operands
506      }
507end
462508
463509   configuration { "vs2015" }
464510      buildoptions {
r250232r250233
513559         "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
514560         "/wd4706", -- warning C4706: assignment within conditional expression
515561      }
562if _OPTIONS["vs"]=="intel-15" then
563      buildoptions {
564         "/Qwd188",           -- error #188: enumerated type mixed with another type
565         "/Qwd344",           -- remark #344: typedef name has already been declared (with same type)
566         "/Qwd869",           -- remark #869: parameter "xxx" was never referenced
567         "/Qwd2557",          -- remark #2557: comparison between signed and unsigned operands
568      }
569end
516570
517571   configuration { "vs2015" }
518572      buildoptions {
r250232r250233
587641         "/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
588642         "/wd4310", -- warning C4310: cast truncates constant value         
589643      }
590
644if _OPTIONS["vs"]=="intel-15" then
645      buildoptions {
646         "/Qwd906",           -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
647         "/Qwd1879",          -- warning #1879: unimplemented pragma ignored
648         "/Qwd82",            -- remark #82: storage class is not first
649      }
650end
591651   configuration { }
592652
593653   includedirs {     
r250232r250233
706766         "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
707767         "/wd4127", -- warning C4127: conditional expression is constant
708768      }
709
769if _OPTIONS["vs"]=="intel-15" then
770      buildoptions {
771         "/Qwd869",           -- remark #869: parameter "xxx" was never referenced
772         "/Qwd1478",          -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
773         "/Qwd2544",          -- message #2544: empty dependent statement in if-statement
774         "/Qwd1879",          -- warning #1879: unimplemented pragma ignored
775      }
776end
710777   configuration { "vs2015" }
711778      buildoptions {
712779         "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
r250232r250233
848915         "-Wno-unused-variable",
849916      }
850917
918   configuration { "vs*" }
919if _OPTIONS["vs"]=="intel-15" then
920      buildoptions {
921         "/Qwd1195",          -- error #1195: conversion from integer to smaller pointer
922      }
923end
924
851925   configuration { }
852926
853927   includedirs {
trunk/src/devices/cpu/dsp56k/dsp56mem.h
r250232r250233
1313void mem_reset(dsp56k_core* cpustate);
1414
1515// Adjusts the documented address to match the offset in peripheral RAM
16#define A2O(a) (a-0xffc0)
16#define A2O(a) (a - 0xffc0)
1717
1818// Adjusts the offset in peripheral RAM to match the documented address
19#define O2A(a) (a+0xffc0)
19#define O2A(a) (a + 0xffc0)
2020
2121// The memory 'registers'
2222#define PBC      (cpustate->peripheral_ram[A2O(0xffc0)])
trunk/src/devices/cpu/i86/i286.cpp
r250232r250233
12921292                     LOADDESC(0x848, DS);
12931293#undef LOADDESC
12941294                     // void cast supresses warning
1295#define LOADDESC(addr, reg, r) { desc[1] = read_word(addr); desc[2] = read_word(addr+2); desc[0] = read_word(addr+4); \
1295#define LOADDESC(addr, reg, r) { desc[1] = read_word(addr); desc[2] = read_word(addr + 2); desc[0] = read_word(addr + 4); \
12961296reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
12971297                     LOADDESC(0x84e, m_gdtr, 1);
12981298                     LOADDESC(0x854, m_ldtr, m_ldtr.rights = RIGHTS(desc));

https://github.com/mamedev/mame/commit/8c0d01d4266e47ec918698fce4d39eb3a5a4c152

Previous 199869 Revisions Next

© 1997-2024 The MAME Team