From 90d908fe07d289ed3e45749c313d5941b9c9ee90 Mon Sep 17 00:00:00 2001 From: Tau Date: Sun, 23 May 2021 10:28:17 -0400 Subject: [PATCH] Statically link current aimeio implementation --- aimeio/aimeio.def | 9 --------- aimeio/meson.build | 3 +-- chunihook/meson.build | 2 +- divahook/meson.build | 2 +- idzhook/meson.build | 2 +- mu3hook/meson.build | 2 +- 6 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 aimeio/aimeio.def diff --git a/aimeio/aimeio.def b/aimeio/aimeio.def deleted file mode 100644 index 6192298..0000000 --- a/aimeio/aimeio.def +++ /dev/null @@ -1,9 +0,0 @@ -LIBRARY aimeio - -EXPORTS - aime_io_fini - aime_io_init - aime_io_led_set_color - aime_io_nfc_poll - aime_io_nfc_get_aime_id - aime_io_nfc_get_felica_id diff --git a/aimeio/meson.build b/aimeio/meson.build index 3715e5e..ddbb66a 100644 --- a/aimeio/meson.build +++ b/aimeio/meson.build @@ -1,9 +1,8 @@ -aimeio_dll = shared_library( +aimeio_lib = static_library( 'aimeio', name_prefix : '', include_directories: inc, implicit_include_directories : false, - vs_module_defs : 'aimeio.def', c_pch : '../precompiled.h', link_with : [ util_lib, diff --git a/chunihook/meson.build b/chunihook/meson.build index 2fab805..9fb6486 100644 --- a/chunihook/meson.build +++ b/chunihook/meson.build @@ -10,7 +10,7 @@ shared_library( capnhook.get_variable('hooklib_dep'), ], link_with : [ - aimeio_dll, + aimeio_lib, amex_lib, board_lib, chuniio_dll, diff --git a/divahook/meson.build b/divahook/meson.build index d49c157..1b09193 100644 --- a/divahook/meson.build +++ b/divahook/meson.build @@ -10,7 +10,7 @@ shared_library( capnhook.get_variable('hooklib_dep'), ], link_with : [ - aimeio_dll, + aimeio_lib, amex_lib, board_lib, divaio_dll, diff --git a/idzhook/meson.build b/idzhook/meson.build index f4a3e8b..e27007a 100644 --- a/idzhook/meson.build +++ b/idzhook/meson.build @@ -11,7 +11,7 @@ shared_library( xinput_lib, ], link_with : [ - aimeio_dll, + aimeio_lib, amex_lib, board_lib, hooklib_lib, diff --git a/mu3hook/meson.build b/mu3hook/meson.build index 4f3ba71..f777b9d 100644 --- a/mu3hook/meson.build +++ b/mu3hook/meson.build @@ -11,7 +11,7 @@ shared_library( xinput_lib, ], link_with : [ - aimeio_dll, + aimeio_lib, board_lib, hooklib_lib, mu3io_dll,