From b44b62fc7268d87aca4dbdf99608c776b5e92363 Mon Sep 17 00:00:00 2001 From: Tau Date: Sun, 9 Jun 2019 15:42:20 -0400 Subject: [PATCH] chunihook: Subsume cardhook One less DLL floating around. --- chunihook/config.c | 3 +++ chunihook/config.h | 1 + chunihook/dllmain.c | 4 ++++ chunihook/meson.build | 1 + 4 files changed, 9 insertions(+) diff --git a/chunihook/config.c b/chunihook/config.c index d2fe313..a6f3892 100644 --- a/chunihook/config.c +++ b/chunihook/config.c @@ -5,6 +5,8 @@ #include "amex/config.h" +#include "board/config.h" + #include "chunihook/config.h" #include "platform/config.h" @@ -20,4 +22,5 @@ void chuni_hook_config_load( nu_config_load(&cfg->nu, filename); amex_config_load(&cfg->amex, filename); + aime_config_load(&cfg->aime, filename); } diff --git a/chunihook/config.h b/chunihook/config.h index f62459a..9a4f16d 100644 --- a/chunihook/config.h +++ b/chunihook/config.h @@ -9,6 +9,7 @@ struct chuni_hook_config { struct nu_config nu; struct amex_config amex; + struct aime_config aime; }; void chuni_hook_config_load( diff --git a/chunihook/dllmain.c b/chunihook/dllmain.c index 14361ca..76be950 100644 --- a/chunihook/dllmain.c +++ b/chunihook/dllmain.c @@ -5,6 +5,9 @@ #include "amex/amex.h" +#include "board/config.h" +#include "board/sg-reader.h" + #include "chunihook/config.h" #include "chunihook/jvs.h" #include "chunihook/slider.h" @@ -56,6 +59,7 @@ static DWORD CALLBACK chuni_pre_startup(void) platform_hook_init_nu(&chuni_hook_cfg.nu, "SDBT", "AAV1", chuni_hook_mod); amex_hook_init(&chuni_hook_cfg.amex); + sg_reader_hook_init(&chuni_hook_cfg.aime, 12); if (chuni_hook_cfg.amex.jvs.enable) { chunithm_jvs_init(); diff --git a/chunihook/meson.build b/chunihook/meson.build index ebb3403..f341d0f 100644 --- a/chunihook/meson.build +++ b/chunihook/meson.build @@ -9,6 +9,7 @@ shared_library( capnhook.get_variable('hooklib_dep'), ], link_with : [ + aimeio_dll, amex_lib, board_lib, chuniio_dll,