From ab50ffac9d5564244ccfdfdbb568a44c00ff3098 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 1 Apr 2015 18:50:27 +1100 Subject: [PATCH] Move osdcore.c back into libocore, don't allow libutil to #include osd --- scripts/src/lib.lua | 282 ++++++++++++++++++------------------ scripts/src/osd/sdl.lua | 1 + scripts/src/osd/windows.lua | 1 + 3 files changed, 142 insertions(+), 142 deletions(-) diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index ceceff028f5..aa49783b82c 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -1,13 +1,12 @@ project "utils" uuid "22489ad0-4cb2-4d91-ad81-24b0d80ca30a" kind "StaticLib" - + options { "ForceCPP", } includedirs { - MAME_DIR .. "src/emu", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", MAME_DIR .. "3rdparty/expat/lib", @@ -17,7 +16,6 @@ project "utils" includeosd() files { - MAME_DIR .. "src/osd/osdcore.c", MAME_DIR .. "src/lib/util/astring.c", MAME_DIR .. "src/lib/util/avhuff.c", MAME_DIR .. "src/lib/util/aviio.c", @@ -54,7 +52,7 @@ project "utils" MAME_DIR .. "src/lib/util/zippath.c", } - + project "formats" uuid "f69636b1-fcce-45ce-b09a-113e371a2d7a" kind "StaticLib" @@ -62,7 +60,7 @@ project "formats" options { "ForceCPP", "ArchiveSplit", - } + } includedirs { MAME_DIR .. "src/emu", @@ -73,145 +71,145 @@ project "formats" } includeosd() - + files { - MAME_DIR .. "src/lib/formats/cassimg.c", - MAME_DIR .. "src/lib/formats/flopimg.c", - MAME_DIR .. "src/lib/formats/imageutl.c", - MAME_DIR .. "src/lib/formats/ioprocs.c", - MAME_DIR .. "src/lib/formats/basicdsk.c", - MAME_DIR .. "src/lib/formats/a26_cas.c", - MAME_DIR .. "src/lib/formats/a5105_dsk.c", - MAME_DIR .. "src/lib/formats/abc800_dsk.c", - MAME_DIR .. "src/lib/formats/ace_tap.c", - MAME_DIR .. "src/lib/formats/adam_cas.c", - MAME_DIR .. "src/lib/formats/adam_dsk.c", - MAME_DIR .. "src/lib/formats/ami_dsk.c", - MAME_DIR .. "src/lib/formats/ap2_dsk.c", - MAME_DIR .. "src/lib/formats/apf_apt.c", - MAME_DIR .. "src/lib/formats/apridisk.c", - MAME_DIR .. "src/lib/formats/apollo_dsk.c", - MAME_DIR .. "src/lib/formats/ap_dsk35.c", - MAME_DIR .. "src/lib/formats/applix_dsk.c", - MAME_DIR .. "src/lib/formats/asst128_dsk.c", - MAME_DIR .. "src/lib/formats/atari_dsk.c", - MAME_DIR .. "src/lib/formats/atarist_dsk.c", - MAME_DIR .. "src/lib/formats/atom_tap.c", - MAME_DIR .. "src/lib/formats/bw2_dsk.c", - MAME_DIR .. "src/lib/formats/bw12_dsk.c", - MAME_DIR .. "src/lib/formats/cbm_crt.c", - MAME_DIR .. "src/lib/formats/cbm_tap.c", - MAME_DIR .. "src/lib/formats/ccvf_dsk.c", - MAME_DIR .. "src/lib/formats/cgen_cas.c", - MAME_DIR .. "src/lib/formats/coco_cas.c", - MAME_DIR .. "src/lib/formats/coco_dsk.c", - MAME_DIR .. "src/lib/formats/comx35_dsk.c", - MAME_DIR .. "src/lib/formats/concept_dsk.c", - MAME_DIR .. "src/lib/formats/coupedsk.c", - MAME_DIR .. "src/lib/formats/cpis_dsk.c", - MAME_DIR .. "src/lib/formats/cqm_dsk.c", - MAME_DIR .. "src/lib/formats/csw_cas.c", - MAME_DIR .. "src/lib/formats/d64_dsk.c", - MAME_DIR .. "src/lib/formats/d67_dsk.c", - MAME_DIR .. "src/lib/formats/d71_dsk.c", - MAME_DIR .. "src/lib/formats/d80_dsk.c", - MAME_DIR .. "src/lib/formats/d81_dsk.c", - MAME_DIR .. "src/lib/formats/d82_dsk.c", - MAME_DIR .. "src/lib/formats/d88_dsk.c", - MAME_DIR .. "src/lib/formats/dcp_dsk.c", - MAME_DIR .. "src/lib/formats/dfi_dsk.c", - MAME_DIR .. "src/lib/formats/dim_dsk.c", - MAME_DIR .. "src/lib/formats/dip_dsk.c", - MAME_DIR .. "src/lib/formats/dmk_dsk.c", - MAME_DIR .. "src/lib/formats/dmv_dsk.c", - MAME_DIR .. "src/lib/formats/dsk_dsk.c", - MAME_DIR .. "src/lib/formats/ep64_dsk.c", - MAME_DIR .. "src/lib/formats/esq8_dsk.c", - MAME_DIR .. "src/lib/formats/esq16_dsk.c", + MAME_DIR .. "src/lib/formats/cassimg.c", + MAME_DIR .. "src/lib/formats/flopimg.c", + MAME_DIR .. "src/lib/formats/imageutl.c", + MAME_DIR .. "src/lib/formats/ioprocs.c", + MAME_DIR .. "src/lib/formats/basicdsk.c", + MAME_DIR .. "src/lib/formats/a26_cas.c", + MAME_DIR .. "src/lib/formats/a5105_dsk.c", + MAME_DIR .. "src/lib/formats/abc800_dsk.c", + MAME_DIR .. "src/lib/formats/ace_tap.c", + MAME_DIR .. "src/lib/formats/adam_cas.c", + MAME_DIR .. "src/lib/formats/adam_dsk.c", + MAME_DIR .. "src/lib/formats/ami_dsk.c", + MAME_DIR .. "src/lib/formats/ap2_dsk.c", + MAME_DIR .. "src/lib/formats/apf_apt.c", + MAME_DIR .. "src/lib/formats/apridisk.c", + MAME_DIR .. "src/lib/formats/apollo_dsk.c", + MAME_DIR .. "src/lib/formats/ap_dsk35.c", + MAME_DIR .. "src/lib/formats/applix_dsk.c", + MAME_DIR .. "src/lib/formats/asst128_dsk.c", + MAME_DIR .. "src/lib/formats/atari_dsk.c", + MAME_DIR .. "src/lib/formats/atarist_dsk.c", + MAME_DIR .. "src/lib/formats/atom_tap.c", + MAME_DIR .. "src/lib/formats/bw2_dsk.c", + MAME_DIR .. "src/lib/formats/bw12_dsk.c", + MAME_DIR .. "src/lib/formats/cbm_crt.c", + MAME_DIR .. "src/lib/formats/cbm_tap.c", + MAME_DIR .. "src/lib/formats/ccvf_dsk.c", + MAME_DIR .. "src/lib/formats/cgen_cas.c", + MAME_DIR .. "src/lib/formats/coco_cas.c", + MAME_DIR .. "src/lib/formats/coco_dsk.c", + MAME_DIR .. "src/lib/formats/comx35_dsk.c", + MAME_DIR .. "src/lib/formats/concept_dsk.c", + MAME_DIR .. "src/lib/formats/coupedsk.c", + MAME_DIR .. "src/lib/formats/cpis_dsk.c", + MAME_DIR .. "src/lib/formats/cqm_dsk.c", + MAME_DIR .. "src/lib/formats/csw_cas.c", + MAME_DIR .. "src/lib/formats/d64_dsk.c", + MAME_DIR .. "src/lib/formats/d67_dsk.c", + MAME_DIR .. "src/lib/formats/d71_dsk.c", + MAME_DIR .. "src/lib/formats/d80_dsk.c", + MAME_DIR .. "src/lib/formats/d81_dsk.c", + MAME_DIR .. "src/lib/formats/d82_dsk.c", + MAME_DIR .. "src/lib/formats/d88_dsk.c", + MAME_DIR .. "src/lib/formats/dcp_dsk.c", + MAME_DIR .. "src/lib/formats/dfi_dsk.c", + MAME_DIR .. "src/lib/formats/dim_dsk.c", + MAME_DIR .. "src/lib/formats/dip_dsk.c", + MAME_DIR .. "src/lib/formats/dmk_dsk.c", + MAME_DIR .. "src/lib/formats/dmv_dsk.c", + MAME_DIR .. "src/lib/formats/dsk_dsk.c", + MAME_DIR .. "src/lib/formats/ep64_dsk.c", + MAME_DIR .. "src/lib/formats/esq8_dsk.c", + MAME_DIR .. "src/lib/formats/esq16_dsk.c", MAME_DIR .. "src/lib/formats/excali64_dsk.c", - MAME_DIR .. "src/lib/formats/fc100_cas.c", - MAME_DIR .. "src/lib/formats/fdi_dsk.c", - MAME_DIR .. "src/lib/formats/fdd_dsk.c", - MAME_DIR .. "src/lib/formats/flex_dsk.c", - MAME_DIR .. "src/lib/formats/fm7_cas.c", - MAME_DIR .. "src/lib/formats/fmsx_cas.c", - MAME_DIR .. "src/lib/formats/fmtowns_dsk.c", - MAME_DIR .. "src/lib/formats/g64_dsk.c", - MAME_DIR .. "src/lib/formats/gtp_cas.c", - MAME_DIR .. "src/lib/formats/hect_dsk.c", - MAME_DIR .. "src/lib/formats/hect_tap.c", - MAME_DIR .. "src/lib/formats/iq151_dsk.c", - MAME_DIR .. "src/lib/formats/imd_dsk.c", - MAME_DIR .. "src/lib/formats/ipf_dsk.c", - MAME_DIR .. "src/lib/formats/kaypro_dsk.c", - MAME_DIR .. "src/lib/formats/kc_cas.c", - MAME_DIR .. "src/lib/formats/kc85_dsk.c", - MAME_DIR .. "src/lib/formats/kim1_cas.c", - MAME_DIR .. "src/lib/formats/lviv_lvt.c", - MAME_DIR .. "src/lib/formats/m20_dsk.c", - MAME_DIR .. "src/lib/formats/m5_dsk.c", - MAME_DIR .. "src/lib/formats/mbee_cas.c", - MAME_DIR .. "src/lib/formats/mm_dsk.c", - MAME_DIR .. "src/lib/formats/msx_dsk.c", - MAME_DIR .. "src/lib/formats/mfi_dsk.c", - MAME_DIR .. "src/lib/formats/mz_cas.c", - MAME_DIR .. "src/lib/formats/nanos_dsk.c", - MAME_DIR .. "src/lib/formats/naslite_dsk.c", - MAME_DIR .. "src/lib/formats/nes_dsk.c", - MAME_DIR .. "src/lib/formats/nfd_dsk.c", - MAME_DIR .. "src/lib/formats/orao_cas.c", - MAME_DIR .. "src/lib/formats/oric_dsk.c", - MAME_DIR .. "src/lib/formats/oric_tap.c", - MAME_DIR .. "src/lib/formats/p6001_cas.c", - MAME_DIR .. "src/lib/formats/pasti_dsk.c", - MAME_DIR .. "src/lib/formats/pc_dsk.c", - MAME_DIR .. "src/lib/formats/pc98_dsk.c", - MAME_DIR .. "src/lib/formats/pc98fdi_dsk.c", - MAME_DIR .. "src/lib/formats/phc25_cas.c", - MAME_DIR .. "src/lib/formats/pmd_cas.c", - MAME_DIR .. "src/lib/formats/primoptp.c", - MAME_DIR .. "src/lib/formats/pyldin_dsk.c", - MAME_DIR .. "src/lib/formats/ql_dsk.c", - MAME_DIR .. "src/lib/formats/rk_cas.c", - MAME_DIR .. "src/lib/formats/rx50_dsk.c", - MAME_DIR .. "src/lib/formats/sc3000_bit.c", - MAME_DIR .. "src/lib/formats/sf7000_dsk.c", - MAME_DIR .. "src/lib/formats/smx_dsk.c", - MAME_DIR .. "src/lib/formats/sol_cas.c", - MAME_DIR .. "src/lib/formats/sorc_dsk.c", - MAME_DIR .. "src/lib/formats/sorc_cas.c", - MAME_DIR .. "src/lib/formats/sord_cas.c", - MAME_DIR .. "src/lib/formats/spc1000_cas.c", - MAME_DIR .. "src/lib/formats/st_dsk.c", - MAME_DIR .. "src/lib/formats/svi_cas.c", - MAME_DIR .. "src/lib/formats/svi_dsk.c", - MAME_DIR .. "src/lib/formats/tandy2k_dsk.c", - MAME_DIR .. "src/lib/formats/td0_dsk.c", - MAME_DIR .. "src/lib/formats/thom_cas.c", - MAME_DIR .. "src/lib/formats/thom_dsk.c", - MAME_DIR .. "src/lib/formats/ti99_dsk.c", - MAME_DIR .. "src/lib/formats/tiki100_dsk.c", - MAME_DIR .. "src/lib/formats/trd_dsk.c", - MAME_DIR .. "src/lib/formats/trs_cas.c", - MAME_DIR .. "src/lib/formats/trs_dsk.c", - MAME_DIR .. "src/lib/formats/tvc_cas.c", - MAME_DIR .. "src/lib/formats/tvc_dsk.c", - MAME_DIR .. "src/lib/formats/tzx_cas.c", - MAME_DIR .. "src/lib/formats/uef_cas.c", - MAME_DIR .. "src/lib/formats/upd765_dsk.c", + MAME_DIR .. "src/lib/formats/fc100_cas.c", + MAME_DIR .. "src/lib/formats/fdi_dsk.c", + MAME_DIR .. "src/lib/formats/fdd_dsk.c", + MAME_DIR .. "src/lib/formats/flex_dsk.c", + MAME_DIR .. "src/lib/formats/fm7_cas.c", + MAME_DIR .. "src/lib/formats/fmsx_cas.c", + MAME_DIR .. "src/lib/formats/fmtowns_dsk.c", + MAME_DIR .. "src/lib/formats/g64_dsk.c", + MAME_DIR .. "src/lib/formats/gtp_cas.c", + MAME_DIR .. "src/lib/formats/hect_dsk.c", + MAME_DIR .. "src/lib/formats/hect_tap.c", + MAME_DIR .. "src/lib/formats/iq151_dsk.c", + MAME_DIR .. "src/lib/formats/imd_dsk.c", + MAME_DIR .. "src/lib/formats/ipf_dsk.c", + MAME_DIR .. "src/lib/formats/kaypro_dsk.c", + MAME_DIR .. "src/lib/formats/kc_cas.c", + MAME_DIR .. "src/lib/formats/kc85_dsk.c", + MAME_DIR .. "src/lib/formats/kim1_cas.c", + MAME_DIR .. "src/lib/formats/lviv_lvt.c", + MAME_DIR .. "src/lib/formats/m20_dsk.c", + MAME_DIR .. "src/lib/formats/m5_dsk.c", + MAME_DIR .. "src/lib/formats/mbee_cas.c", + MAME_DIR .. "src/lib/formats/mm_dsk.c", + MAME_DIR .. "src/lib/formats/msx_dsk.c", + MAME_DIR .. "src/lib/formats/mfi_dsk.c", + MAME_DIR .. "src/lib/formats/mz_cas.c", + MAME_DIR .. "src/lib/formats/nanos_dsk.c", + MAME_DIR .. "src/lib/formats/naslite_dsk.c", + MAME_DIR .. "src/lib/formats/nes_dsk.c", + MAME_DIR .. "src/lib/formats/nfd_dsk.c", + MAME_DIR .. "src/lib/formats/orao_cas.c", + MAME_DIR .. "src/lib/formats/oric_dsk.c", + MAME_DIR .. "src/lib/formats/oric_tap.c", + MAME_DIR .. "src/lib/formats/p6001_cas.c", + MAME_DIR .. "src/lib/formats/pasti_dsk.c", + MAME_DIR .. "src/lib/formats/pc_dsk.c", + MAME_DIR .. "src/lib/formats/pc98_dsk.c", + MAME_DIR .. "src/lib/formats/pc98fdi_dsk.c", + MAME_DIR .. "src/lib/formats/phc25_cas.c", + MAME_DIR .. "src/lib/formats/pmd_cas.c", + MAME_DIR .. "src/lib/formats/primoptp.c", + MAME_DIR .. "src/lib/formats/pyldin_dsk.c", + MAME_DIR .. "src/lib/formats/ql_dsk.c", + MAME_DIR .. "src/lib/formats/rk_cas.c", + MAME_DIR .. "src/lib/formats/rx50_dsk.c", + MAME_DIR .. "src/lib/formats/sc3000_bit.c", + MAME_DIR .. "src/lib/formats/sf7000_dsk.c", + MAME_DIR .. "src/lib/formats/smx_dsk.c", + MAME_DIR .. "src/lib/formats/sol_cas.c", + MAME_DIR .. "src/lib/formats/sorc_dsk.c", + MAME_DIR .. "src/lib/formats/sorc_cas.c", + MAME_DIR .. "src/lib/formats/sord_cas.c", + MAME_DIR .. "src/lib/formats/spc1000_cas.c", + MAME_DIR .. "src/lib/formats/st_dsk.c", + MAME_DIR .. "src/lib/formats/svi_cas.c", + MAME_DIR .. "src/lib/formats/svi_dsk.c", + MAME_DIR .. "src/lib/formats/tandy2k_dsk.c", + MAME_DIR .. "src/lib/formats/td0_dsk.c", + MAME_DIR .. "src/lib/formats/thom_cas.c", + MAME_DIR .. "src/lib/formats/thom_dsk.c", + MAME_DIR .. "src/lib/formats/ti99_dsk.c", + MAME_DIR .. "src/lib/formats/tiki100_dsk.c", + MAME_DIR .. "src/lib/formats/trd_dsk.c", + MAME_DIR .. "src/lib/formats/trs_cas.c", + MAME_DIR .. "src/lib/formats/trs_dsk.c", + MAME_DIR .. "src/lib/formats/tvc_cas.c", + MAME_DIR .. "src/lib/formats/tvc_dsk.c", + MAME_DIR .. "src/lib/formats/tzx_cas.c", + MAME_DIR .. "src/lib/formats/uef_cas.c", + MAME_DIR .. "src/lib/formats/upd765_dsk.c", MAME_DIR .. "src/lib/formats/victor9k_dsk.c", - MAME_DIR .. "src/lib/formats/vg5k_cas.c", - MAME_DIR .. "src/lib/formats/vt_cas.c", - MAME_DIR .. "src/lib/formats/vt_dsk.c", - MAME_DIR .. "src/lib/formats/vtech1_dsk.c", - MAME_DIR .. "src/lib/formats/wavfile.c", - MAME_DIR .. "src/lib/formats/wd177x_dsk.c", - MAME_DIR .. "src/lib/formats/x07_cas.c", - MAME_DIR .. "src/lib/formats/x1_tap.c", - MAME_DIR .. "src/lib/formats/xdf_dsk.c", - MAME_DIR .. "src/lib/formats/z80ne_dsk.c", - MAME_DIR .. "src/lib/formats/zx81_p.c", - MAME_DIR .. "src/lib/formats/hxcmfm_dsk.c", - MAME_DIR .. "src/lib/formats/itt3030_dsk.c", + MAME_DIR .. "src/lib/formats/vg5k_cas.c", + MAME_DIR .. "src/lib/formats/vt_cas.c", + MAME_DIR .. "src/lib/formats/vt_dsk.c", + MAME_DIR .. "src/lib/formats/vtech1_dsk.c", + MAME_DIR .. "src/lib/formats/wavfile.c", + MAME_DIR .. "src/lib/formats/wd177x_dsk.c", + MAME_DIR .. "src/lib/formats/x07_cas.c", + MAME_DIR .. "src/lib/formats/x1_tap.c", + MAME_DIR .. "src/lib/formats/xdf_dsk.c", + MAME_DIR .. "src/lib/formats/z80ne_dsk.c", + MAME_DIR .. "src/lib/formats/zx81_p.c", + MAME_DIR .. "src/lib/formats/hxcmfm_dsk.c", + MAME_DIR .. "src/lib/formats/itt3030_dsk.c", } diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 96b171c0192..44e0d2863ed 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -373,6 +373,7 @@ project ("ocore_" .. _OPTIONS["osd"]) } files { + MAME_DIR .. "src/osd/osdcore.c", MAME_DIR .. "src/osd/strconv.c", MAME_DIR .. "src/osd/sdl/sdldir.c", MAME_DIR .. "src/osd/sdl/sdlfile.c", diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 8774c848eec..c1275902d3d 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -139,6 +139,7 @@ project ("ocore_" .. _OPTIONS["osd"]) } files { + MAME_DIR .. "src/osd/osdcore.c", MAME_DIR .. "src/osd/strconv.c", MAME_DIR .. "src/osd/windows/main.c", MAME_DIR .. "src/osd/windows/windir.c",