From cb3c55d037eb1ab9841188239df90f20540f699b Mon Sep 17 00:00:00 2001 From: Tau Date: Sun, 6 Jun 2021 09:39:00 -0400 Subject: [PATCH] Statically link default divaio --- divahook/divahook.def | 9 +++++++++ divahook/meson.build | 2 +- divaio/divaio.def | 11 ----------- divaio/meson.build | 3 +-- 4 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 divaio/divaio.def diff --git a/divahook/divahook.def b/divahook/divahook.def index 49075b8..a8f5d10 100644 --- a/divahook/divahook.def +++ b/divahook/divahook.def @@ -12,3 +12,12 @@ EXPORTS amDllVideoGetVBiosVersion @4 amDllVideoOpen @1 amDllVideoSetResolution @3 + diva_io_get_api_version + diva_io_jvs_init + diva_io_jvs_poll + diva_io_jvs_read_coin_counter + diva_io_jvs_set_coin_blocker + diva_io_slider_init + diva_io_slider_set_leds + diva_io_slider_start + diva_io_slider_stop diff --git a/divahook/meson.build b/divahook/meson.build index 1b09193..6310141 100644 --- a/divahook/meson.build +++ b/divahook/meson.build @@ -13,7 +13,7 @@ shared_library( aimeio_lib, amex_lib, board_lib, - divaio_dll, + divaio_lib, hooklib_lib, jvs_lib, platform_lib, diff --git a/divaio/divaio.def b/divaio/divaio.def deleted file mode 100644 index 3191f7b..0000000 --- a/divaio/divaio.def +++ /dev/null @@ -1,11 +0,0 @@ -LIBRARY divaio - -EXPORTS - diva_io_jvs_init - diva_io_jvs_poll - diva_io_jvs_read_coin_counter - diva_io_jvs_set_coin_blocker - diva_io_slider_init - diva_io_slider_set_leds - diva_io_slider_start - diva_io_slider_stop diff --git a/divaio/meson.build b/divaio/meson.build index 30eda9b..edac3b6 100644 --- a/divaio/meson.build +++ b/divaio/meson.build @@ -1,9 +1,8 @@ -divaio_dll = shared_library( +divaio_lib = static_library( 'divaio', name_prefix : '', include_directories : inc, implicit_include_directories : false, - vs_module_defs : 'divaio.def', c_pch : '../precompiled.h', sources : [ 'divaio.c',