summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua65
-rw-r--r--scripts/src/osd/modules.lua1
-rw-r--r--scripts/src/osd/sdl.lua1
3 files changed, 53 insertions, 14 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 77707c5d5b2..b2322b7c655 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -1117,6 +1117,7 @@ project "bx"
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
+ "BX_CONFIG_DEBUG=0",
}
configuration { "vs*" }
@@ -1143,6 +1144,11 @@ project "bx"
MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
}
+ configuration { "linux*" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/linux",
+ }
+
configuration { }
includedirs {
@@ -1211,9 +1217,18 @@ project "bimg"
MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
}
+ configuration { "linux*" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/linux",
+ }
+
configuration { "gmake or ninja" }
buildoptions {
"-Wno-unused-but-set-variable",
+ "-Wno-undef",
+ }
+ buildoptions_c {
+ "-Wno-strict-prototypes",
}
configuration { }
@@ -1230,29 +1245,44 @@ project "bimg"
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
+ "BX_CONFIG_DEBUG=0",
}
includedirs {
MAME_DIR .. "3rdparty/bimg/include",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/include",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/include",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/tinyexr/deps/miniz",
}
files {
MAME_DIR .. "3rdparty/bimg/src/image.cpp",
MAME_DIR .. "3rdparty/bimg/src/image_gnf.cpp",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/astc_file.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/codec.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/endpoint_codec.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/footprint.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/integer_sequence_codec.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/logical_astc_block.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/partition.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/physical_astc_block.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/quantization.cc",
- MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/weight_infill.cc",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_averages_and_directions.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_block_sizes.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_color_quantize.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_color_unquantize.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_compress_symbolic.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_compute_variance.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_decompress_symbolic.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_diagnostic_trace.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_entry.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_find_best_partitioning.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_ideal_endpoints_and_weights.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_image.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_integer_sequence.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_mathlib.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_mathlib_softfloat.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_partition_tables.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_percentile_tables.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_pick_best_endpoint_format.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_platform_isa_detection.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_quantization.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_symbolic_physical.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_weight_align.cpp",
+ MAME_DIR .. "3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_weight_quant_xfer_tables.cpp",
+
+ MAME_DIR .. "3rdparty/bimg/3rdparty/tinyexr/deps/miniz/miniz.c",
}
@@ -1287,7 +1317,7 @@ end
MAME_DIR .. "3rdparty/bgfx/3rdparty",
MAME_DIR .. "3rdparty/bx/include",
MAME_DIR .. "3rdparty/bimg/include",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/directx-headers/include/directx",
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
}
@@ -1320,6 +1350,12 @@ end
MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
}
+ configuration { "linux*" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/directx-headers/include/wsl/stubs",
+ MAME_DIR .. "3rdparty/bx/include/compat/linux",
+ }
+
configuration { "gmake or ninja" }
buildoptions {
"-Wno-uninitialized",
@@ -1371,6 +1407,7 @@ end
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
+ "BX_CONFIG_DEBUG=0",
"BGFX_CONFIG_MAX_FRAME_BUFFERS=128",
}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 3c0da69f3c6..d1769833efa 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -174,6 +174,7 @@ function osdmodulesbuild()
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
+ "BX_CONFIG_DEBUG=0",
}
files {
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index f8d698a0b51..a110cce6f4f 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -266,6 +266,7 @@ if BASE_TARGETOS=="unix" then
linkoptions {
"-framework QuartzCore",
"-framework OpenGL",
+ "-framework IOKit",
}
vatar'> Olivier Galibert2018-03-141-47/+52 * API change: Memory maps are now methods of the owner class [O. Galibert] Olivier Galibert2018-02-121-5/+5 * xtal.h is dead, long live to xtal.cpp [O. Galibert] Olivier Galibert2018-01-231-1/+1 * API Change: Machine configs are now a method of the owner class, and the prot... Olivier Galibert2018-01-171-3/+3 * This causes huge changes in behaviour that can't be hand-waved away. Vas Crabb2018-01-131-2/+5 * New way to provide DAC reference inputs (nw) AJR2018-01-101-5/+2 * Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame"" Firehawke2017-12-131-1/+1 * Revert "Merge branch 'master' of https://github.com/mamedev/mame" Firehawke2017-12-131-1/+1 * get rid of legacy BITSWAP* (nw) Vas Crabb2017-12-131-1/+1 * s2650: I/O modernization AJR2017-06-221-2/+2 * Move static data out of devices into the device types. This is a significant... Vas Crabb2017-05-141-6/+6 * Self-registering devices prep: Vas Crabb2017-02-271-0/+3 * Remove emu.h from headers (nw) Olivier Galibert2017-02-111-0/+1 * NOTICE (TYPE NAME CONSOLIDATION) Miodrag Milanovic2016-10-221-9/+9 * DAC WIP, started documenting the DACs in use. [smf] smf-2016-10-171-13/+13 * Further IRQ passthrough cleanup AJR2016-07-081-2/+2 * Add support to adjust the screen color Dirk Best2016-03-121-3/+3 * clang-modernize part 7 Miodrag Milanovic2015-12-041-1/+1