mirror of
https://github.com/holub/mame
synced 2025-04-16 13:34:55 +03:00
update build scripts and code change in order to fix compile (nw)
This commit is contained in:
parent
deb9df99b5
commit
ee7ff77255
3306
scripts/src/bus.lua
3306
scripts/src/bus.lua
File diff suppressed because it is too large
Load Diff
1580
scripts/src/cpu.lua
1580
scripts/src/cpu.lua
File diff suppressed because it is too large
Load Diff
@ -12,6 +12,7 @@ options {
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices", -- till deps are fixed
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
MAME_DIR .. "3rdparty",
|
||||
@ -249,63 +250,63 @@ files {
|
||||
MAME_DIR .. "src/emu/webengine.h",
|
||||
MAME_DIR .. "src/emu/sound/filter.c",
|
||||
MAME_DIR .. "src/emu/sound/filter.h",
|
||||
MAME_DIR .. "src/emu/sound/flt_vol.c",
|
||||
MAME_DIR .. "src/emu/sound/flt_vol.h",
|
||||
MAME_DIR .. "src/emu/sound/flt_rc.c",
|
||||
MAME_DIR .. "src/emu/sound/flt_rc.h",
|
||||
MAME_DIR .. "src/devices/sound/flt_vol.c",
|
||||
MAME_DIR .. "src/devices/sound/flt_vol.h",
|
||||
MAME_DIR .. "src/devices/sound/flt_rc.c",
|
||||
MAME_DIR .. "src/devices/sound/flt_rc.h",
|
||||
MAME_DIR .. "src/emu/sound/wavwrite.c",
|
||||
MAME_DIR .. "src/emu/sound/wavwrite.h",
|
||||
MAME_DIR .. "src/emu/sound/samples.c",
|
||||
MAME_DIR .. "src/emu/sound/samples.h",
|
||||
MAME_DIR .. "src/devices/sound/samples.c",
|
||||
MAME_DIR .. "src/devices/sound/samples.h",
|
||||
MAME_DIR .. "src/emu/drivers/empty.c",
|
||||
MAME_DIR .. "src/emu/drivers/testcpu.c",
|
||||
MAME_DIR .. "src/emu/drivers/xtal.h",
|
||||
MAME_DIR .. "src/emu/machine/bcreader.c",
|
||||
MAME_DIR .. "src/emu/machine/bcreader.h",
|
||||
MAME_DIR .. "src/emu/machine/buffer.c",
|
||||
MAME_DIR .. "src/emu/machine/buffer.h",
|
||||
MAME_DIR .. "src/emu/machine/clock.c",
|
||||
MAME_DIR .. "src/emu/machine/clock.h",
|
||||
MAME_DIR .. "src/devices/machine/bcreader.c",
|
||||
MAME_DIR .. "src/devices/machine/bcreader.h",
|
||||
MAME_DIR .. "src/devices/machine/buffer.c",
|
||||
MAME_DIR .. "src/devices/machine/buffer.h",
|
||||
MAME_DIR .. "src/devices/machine/clock.c",
|
||||
MAME_DIR .. "src/devices/machine/clock.h",
|
||||
MAME_DIR .. "src/emu/machine/generic.c",
|
||||
MAME_DIR .. "src/emu/machine/generic.h",
|
||||
MAME_DIR .. "src/emu/machine/keyboard.c",
|
||||
MAME_DIR .. "src/emu/machine/keyboard.h",
|
||||
MAME_DIR .. "src/emu/machine/laserdsc.c",
|
||||
MAME_DIR .. "src/emu/machine/laserdsc.h",
|
||||
MAME_DIR .. "src/emu/machine/latch.c",
|
||||
MAME_DIR .. "src/emu/machine/latch.h",
|
||||
MAME_DIR .. "src/emu/machine/nvram.c",
|
||||
MAME_DIR .. "src/emu/machine/nvram.h",
|
||||
MAME_DIR .. "src/emu/machine/ram.c",
|
||||
MAME_DIR .. "src/emu/machine/ram.h",
|
||||
MAME_DIR .. "src/emu/machine/legscsi.c",
|
||||
MAME_DIR .. "src/emu/machine/legscsi.h",
|
||||
MAME_DIR .. "src/emu/machine/terminal.c",
|
||||
MAME_DIR .. "src/emu/machine/terminal.h",
|
||||
MAME_DIR .. "src/emu/imagedev/bitbngr.c",
|
||||
MAME_DIR .. "src/emu/imagedev/bitbngr.h",
|
||||
MAME_DIR .. "src/emu/imagedev/cassette.c",
|
||||
MAME_DIR .. "src/emu/imagedev/cassette.h",
|
||||
MAME_DIR .. "src/emu/imagedev/chd_cd.c",
|
||||
MAME_DIR .. "src/emu/imagedev/chd_cd.h",
|
||||
MAME_DIR .. "src/emu/imagedev/diablo.c",
|
||||
MAME_DIR .. "src/emu/imagedev/diablo.h",
|
||||
MAME_DIR .. "src/emu/imagedev/flopdrv.c",
|
||||
MAME_DIR .. "src/emu/imagedev/flopdrv.h",
|
||||
MAME_DIR .. "src/emu/imagedev/floppy.c",
|
||||
MAME_DIR .. "src/emu/imagedev/floppy.h",
|
||||
MAME_DIR .. "src/emu/imagedev/harddriv.c",
|
||||
MAME_DIR .. "src/emu/imagedev/harddriv.h",
|
||||
MAME_DIR .. "src/emu/imagedev/mfmhd.c",
|
||||
MAME_DIR .. "src/emu/imagedev/mfmhd.h",
|
||||
MAME_DIR .. "src/emu/imagedev/midiin.c",
|
||||
MAME_DIR .. "src/emu/imagedev/midiin.h",
|
||||
MAME_DIR .. "src/emu/imagedev/midiout.c",
|
||||
MAME_DIR .. "src/emu/imagedev/midiout.h",
|
||||
MAME_DIR .. "src/emu/imagedev/printer.c",
|
||||
MAME_DIR .. "src/emu/imagedev/printer.h",
|
||||
MAME_DIR .. "src/emu/imagedev/snapquik.c",
|
||||
MAME_DIR .. "src/emu/imagedev/snapquik.h",
|
||||
MAME_DIR .. "src/devices/machine/keyboard.c",
|
||||
MAME_DIR .. "src/devices/machine/keyboard.h",
|
||||
MAME_DIR .. "src/devices/machine/laserdsc.c",
|
||||
MAME_DIR .. "src/devices/machine/laserdsc.h",
|
||||
MAME_DIR .. "src/devices/machine/latch.c",
|
||||
MAME_DIR .. "src/devices/machine/latch.h",
|
||||
MAME_DIR .. "src/devices/machine/nvram.c",
|
||||
MAME_DIR .. "src/devices/machine/nvram.h",
|
||||
MAME_DIR .. "src/devices/machine/ram.c",
|
||||
MAME_DIR .. "src/devices/machine/ram.h",
|
||||
MAME_DIR .. "src/devices/machine/legscsi.c",
|
||||
MAME_DIR .. "src/devices/machine/legscsi.h",
|
||||
MAME_DIR .. "src/devices/machine/terminal.c",
|
||||
MAME_DIR .. "src/devices/machine/terminal.h",
|
||||
MAME_DIR .. "src/devices/imagedev/bitbngr.c",
|
||||
MAME_DIR .. "src/devices/imagedev/bitbngr.h",
|
||||
MAME_DIR .. "src/devices/imagedev/cassette.c",
|
||||
MAME_DIR .. "src/devices/imagedev/cassette.h",
|
||||
MAME_DIR .. "src/devices/imagedev/chd_cd.c",
|
||||
MAME_DIR .. "src/devices/imagedev/chd_cd.h",
|
||||
MAME_DIR .. "src/devices/imagedev/diablo.c",
|
||||
MAME_DIR .. "src/devices/imagedev/diablo.h",
|
||||
MAME_DIR .. "src/devices/imagedev/flopdrv.c",
|
||||
MAME_DIR .. "src/devices/imagedev/flopdrv.h",
|
||||
MAME_DIR .. "src/devices/imagedev/floppy.c",
|
||||
MAME_DIR .. "src/devices/imagedev/floppy.h",
|
||||
MAME_DIR .. "src/devices/imagedev/harddriv.c",
|
||||
MAME_DIR .. "src/devices/imagedev/harddriv.h",
|
||||
MAME_DIR .. "src/devices/imagedev/mfmhd.c",
|
||||
MAME_DIR .. "src/devices/imagedev/mfmhd.h",
|
||||
MAME_DIR .. "src/devices/imagedev/midiin.c",
|
||||
MAME_DIR .. "src/devices/imagedev/midiin.h",
|
||||
MAME_DIR .. "src/devices/imagedev/midiout.c",
|
||||
MAME_DIR .. "src/devices/imagedev/midiout.h",
|
||||
MAME_DIR .. "src/devices/imagedev/printer.c",
|
||||
MAME_DIR .. "src/devices/imagedev/printer.h",
|
||||
MAME_DIR .. "src/devices/imagedev/snapquik.c",
|
||||
MAME_DIR .. "src/devices/imagedev/snapquik.h",
|
||||
MAME_DIR .. "src/emu/video/generic.c",
|
||||
MAME_DIR .. "src/emu/video/generic.h",
|
||||
MAME_DIR .. "src/emu/video/resnet.c",
|
||||
@ -319,7 +320,7 @@ files {
|
||||
MAME_DIR .. "src/emu/video/rgbvmx.h",
|
||||
MAME_DIR .. "src/emu/video/vector.c",
|
||||
MAME_DIR .. "src/emu/video/vector.h",
|
||||
MAME_DIR .. "src/emu/video/poly.h",
|
||||
MAME_DIR .. "src/devices/video/poly.h",
|
||||
}
|
||||
|
||||
dependency {
|
||||
@ -379,6 +380,7 @@ function emuProject(_target, _subtarget)
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/lib/netlist",
|
||||
MAME_DIR .. "src/mame", -- used for sound amiga
|
||||
MAME_DIR .. "src/lib",
|
||||
@ -426,6 +428,7 @@ if (_OPTIONS["DRIVERS"] == nil) then
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/lib/netlist",
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
@ -471,6 +474,7 @@ end
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
MAME_DIR .. "3rdparty",
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -307,6 +307,7 @@ project ("osd_" .. _OPTIONS["osd"])
|
||||
|
||||
includedirs {
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices", -- accessing imagedev from debugger
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
|
@ -115,6 +115,7 @@ project ("osd_" .. _OPTIONS["osd"])
|
||||
|
||||
includedirs {
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices", -- accessing imagedev from debugger
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -772,6 +772,7 @@ function createMAMEProjects(_target, _subtarget, _name)
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/mame",
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
|
@ -25,6 +25,7 @@ function createProjects_mame_dummy(_target, _subtarget)
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/mess",
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
|
@ -882,6 +882,7 @@ function createMESSProjects(_target, _subtarget, _name)
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/mess",
|
||||
MAME_DIR .. "src/mame",
|
||||
MAME_DIR .. "src/lib",
|
||||
@ -890,7 +891,7 @@ function createMESSProjects(_target, _subtarget, _name)
|
||||
MAME_DIR .. "3rdparty",
|
||||
GEN_DIR .. "mess/layout",
|
||||
GEN_DIR .. "mame/layout",
|
||||
MAME_DIR .. "src/emu/cpu/m68000",
|
||||
MAME_DIR .. "src/devices/cpu/m68000",
|
||||
}
|
||||
if _OPTIONS["with-bundled-zlib"] then
|
||||
includedirs {
|
||||
|
@ -92,6 +92,7 @@ function createProjects_mame_nl(_target, _subtarget)
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/lib/netlist",
|
||||
MAME_DIR .. "src/mame",
|
||||
MAME_DIR .. "src/lib",
|
||||
|
@ -88,6 +88,7 @@ function createProjects_mame_tiny(_target, _subtarget)
|
||||
includedirs {
|
||||
MAME_DIR .. "src/osd",
|
||||
MAME_DIR .. "src/emu",
|
||||
MAME_DIR .. "src/devices",
|
||||
MAME_DIR .. "src/mame",
|
||||
MAME_DIR .. "src/lib",
|
||||
MAME_DIR .. "src/lib/util",
|
||||
|
@ -10,7 +10,7 @@ import sys
|
||||
|
||||
files_included = ['src/emu/emu.h']
|
||||
|
||||
include_dirs = ['src/emu/', 'src/mame/', 'src/mess/']
|
||||
include_dirs = ['src/emu/', 'src/devices/', 'src/mame/', 'src/mess/']
|
||||
|
||||
mappings = dict()
|
||||
|
||||
@ -287,6 +287,7 @@ if sys.argv[3]=='target':
|
||||
sys.stdout.write(' includedirs {\n')
|
||||
sys.stdout.write(' MAME_DIR .. "src/osd",\n')
|
||||
sys.stdout.write(' MAME_DIR .. "src/emu",\n')
|
||||
sys.stdout.write(' MAME_DIR .. "src/devices",\n')
|
||||
sys.stdout.write(' MAME_DIR .. "src/mame",\n')
|
||||
sys.stdout.write(' MAME_DIR .. "src/mess",\n')
|
||||
sys.stdout.write(' MAME_DIR .. "src/lib",\n')
|
||||
|
@ -36,7 +36,7 @@
|
||||
************************************************************************/
|
||||
|
||||
#include "emu.h"
|
||||
#include "wavwrite.h"
|
||||
#include "sound/wavwrite.h"
|
||||
#include "discrete.h"
|
||||
|
||||
// for now, make buggy GCC/Mingw STFU about I64FMT
|
||||
|
@ -3467,7 +3467,7 @@
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
#include "wavwrite.h"
|
||||
#include "sound/wavwrite.h"
|
||||
|
||||
/*************************************
|
||||
*
|
||||
|
@ -96,7 +96,7 @@ Ensoniq OTIS - ES5505 Ensoniq OTTO -
|
||||
#define RAINE_CHECK 0
|
||||
|
||||
#if MAKE_WAVS
|
||||
#include "wavwrite.h"
|
||||
#include "sound/wavwrite.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -37,7 +37,7 @@ Registers per channel:
|
||||
|
||||
#include "emu.h"
|
||||
#include "gaelco.h"
|
||||
#include "wavwrite.h"
|
||||
#include "sound/wavwrite.h"
|
||||
|
||||
#define VERBOSE_SOUND 0
|
||||
#define VERBOSE_READ_WRITES 0
|
||||
|
@ -30,7 +30,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
#include "emu.h"
|
||||
#include "wavwrite.h"
|
||||
#include "sound/wavwrite.h"
|
||||
#include "sn76477.h"
|
||||
|
||||
|
||||
|
@ -44,7 +44,7 @@
|
||||
#define INTERNAL_SAMPLE_RATE (m_master_clock * 2.0)
|
||||
|
||||
#if MAKE_WAVS
|
||||
#include "wavwrite.h"
|
||||
#include "sound/wavwrite.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user