Previous 199869 Revisions Next

r37096 Saturday 11th April, 2015 at 06:46:02 UTC by Miodrag Milanović
Added SHADOW_CHECK parameter so we can work on shadowing issues in our code (nw)
[/trunk]makefile
[scripts]genie.lua
[scripts/src]3rdparty.lua

trunk/makefile
r245607r245608
7676# FILTER_DEPS = 1
7777# SEPARATE_BIN = 1
7878# PYTHON_EXECUTABLE = python3
79# SHADOW_CHECK = 1
7980
8081-include useroptions.mak
8182
r245607r245608
520521PARAMS += --PYTHON_EXECUTABLE='$(PYTHON_EXECUTABLE)'
521522endif
522523
524ifdef SHADOW_CHECK
525PARAMS += --SHADOW_CHECK='$(SHADOW_CHECK)'
526endif
527
523528#-------------------------------------------------
524529# All scripts
525530#-------------------------------------------------
trunk/scripts/genie.lua
r245607r245608
279279   description = "Python executable.",
280280}
281281
282newoption {
283   trigger = "SHADOW_CHECK",
284   description = "Shadow checks.",
285   allowed = {
286      { "0",   "Disabled"    },
287      { "1",   "Enabled"      },
288   }
289}
290
291
282292PYTHON = "python"
283293
284294if _OPTIONS["PYTHON_EXECUTABLE"]~=nil then
r245607r245608
832842            }
833843         end
834844      else
845         if (_OPTIONS["SHADOW_CHECK"]=="1") then
846            buildoptions {
847               "-Wshadow"
848            }         
849         end
835850         if (version == 40201) then
836851            buildoptions {
837852               "-Wno-cast-align"
trunk/scripts/src/3rdparty.lua
r245607r245608
1515      MAME_DIR .. "3rdparty/expat/lib/xmlrole.c",
1616      MAME_DIR .. "3rdparty/expat/lib/xmltok.c",
1717   }
18   if (_OPTIONS["SHADOW_CHECK"]=="1") then
19      removebuildoptions {
20         "-Wshadow"
21      }
22   end
1823
1924--------------------------------------------------
2025-- zlib library objects
r245607r245608
5257      MAME_DIR .. "3rdparty/zlib/uncompr.c",
5358      MAME_DIR .. "3rdparty/zlib/zutil.c",
5459   }
60   if (_OPTIONS["SHADOW_CHECK"]=="1") then
61      removebuildoptions {
62         "-Wshadow"
63      }
64   end
5565
5666--------------------------------------------------
5767-- SoftFloat library objects
r245607r245608
7989      MAME_DIR .. "3rdparty/softfloat/fsincos.c",
8090      MAME_DIR .. "3rdparty/softfloat/fyl2x.c",
8191   }
92   if (_OPTIONS["SHADOW_CHECK"]=="1") then
93      removebuildoptions {
94         "-Wshadow"
95      }
96   end
8297
8398--------------------------------------------------
8499-- libJPEG library objects
r245607r245608
136151      MAME_DIR .. "3rdparty/libjpeg/jmemmgr.c",
137152      MAME_DIR .. "3rdparty/libjpeg/jmemansi.c",
138153   }
154   if (_OPTIONS["SHADOW_CHECK"]=="1") then
155      removebuildoptions {
156         "-Wshadow"
157      }
158   end
139159
140160--------------------------------------------------
141161-- libflac library objects
r245607r245608
190210      MAME_DIR .. "3rdparty/libflac/src/libFLAC/stream_encoder_framing.c",
191211      MAME_DIR .. "3rdparty/libflac/src/libFLAC/window.c",
192212   }
213   if (_OPTIONS["SHADOW_CHECK"]=="1") then
214      removebuildoptions {
215         "-Wshadow"
216      }
217   end
193218
194219--------------------------------------------------
195220-- lib7z library objects
r245607r245608
225250         MAME_DIR .. "3rdparty/lzma/C/Ppmd7Dec.c",
226251         MAME_DIR .. "3rdparty/lzma/C/7zStream.c",
227252      }
253   if (_OPTIONS["SHADOW_CHECK"]=="1") then
254      removebuildoptions {
255         "-Wshadow"
256      }
257   end
228258
229259--------------------------------------------------
230260-- LUA library objects
r245607r245608
290320      MAME_DIR .. "3rdparty/lua/src/linit.c",
291321      MAME_DIR .. "3rdparty/lua/src/lutf8lib.c",
292322   }
323   if (_OPTIONS["SHADOW_CHECK"]=="1") then
324      removebuildoptions {
325         "-Wshadow"
326      }
327   end
293328
294329--------------------------------------------------
295330-- sqlite3 lua library objects
r245607r245608
312347   files {
313348      MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
314349   }
350   if (_OPTIONS["SHADOW_CHECK"]=="1") then
351      removebuildoptions {
352         "-Wshadow"
353      }
354   end
315355
316356--------------------------------------------------
317357-- mongoose library objects
r245607r245608
336376   files {
337377      MAME_DIR .. "3rdparty/mongoose/mongoose.c",
338378   }
379   if (_OPTIONS["SHADOW_CHECK"]=="1") then
380      removebuildoptions {
381         "-Wshadow"
382      }
383   end
339384
340385--------------------------------------------------
341386-- jsoncpp library objects
r245607r245608
359404      MAME_DIR .. "3rdparty/jsoncpp/src/lib_json/json_writer.cpp",
360405     
361406   }
407   if (_OPTIONS["SHADOW_CHECK"]=="1") then
408      removebuildoptions {
409         "-Wshadow"
410      }
411   end
362412
363413--------------------------------------------------
364414-- SQLite3 library objects
r245607r245608
379429   files {
380430      MAME_DIR .. "3rdparty/sqlite3/sqlite3.c",
381431   }
432   if (_OPTIONS["SHADOW_CHECK"]=="1") then
433      removebuildoptions {
434         "-Wshadow"
435      }
436   end
382437
383438--------------------------------------------------
384439-- portmidi library objects
r245607r245608
433488         MAME_DIR .. "3rdparty/portmidi/porttime/ptmacosx_mach.c",
434489      }
435490   end
491   if (_OPTIONS["SHADOW_CHECK"]=="1") then
492      removebuildoptions {
493         "-Wshadow"
494      }
495   end
436496end   
437497--------------------------------------------------
438498-- BGFX library objects
r245607r245608
517577         
518578      }
519579   end
580   if (_OPTIONS["SHADOW_CHECK"]=="1") then
581      removebuildoptions {
582         "-Wshadow"
583      }
584   end
520585end

https://github.com/mamedev/mame/commit/59e60e47df58ede7fdd69ed9c78de08ba76f79ab

Previous 199869 Revisions Next

© 1997-2024 The MAME Team