Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

モデルファイル同梱でのdll名指定をなくす #107

Merged
merged 10 commits into from
Mar 26, 2022
Merged

モデルファイル同梱でのdll名指定をなくす #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
76d3127
とりあえず実装
Oyaki122 Mar 13, 2022
20c6627
shiftjis to utf8
Oyaki122 Mar 15, 2022
ce22763
Merge branch 'cpp-library' into cpp_example
Oyaki122 Mar 15, 2022
92b6aef
場所移動
Oyaki122 Mar 18, 2022
6b5eb3c
Merge branch 'main' into cpp_example
Oyaki122 Mar 23, 2022
7dea81f
getModuleHandleExを使用
Oyaki122 Mar 23, 2022
40cd765
LibName引数を削除
Oyaki122 Mar 23, 2022
8aed679
example試作が混入したので削除
Oyaki122 Mar 23, 2022
5a6aae1
ignoreの差分を削除
Oyaki122 Mar 23, 2022
8a4f265
fix
Oyaki122 Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ if(EXISTS "${MODEL_DIR}/metas.json"
AND EXISTS "${MODEL_DIR}/yukarin_sa.onnx"
AND EXISTS "${MODEL_DIR}/decode.onnx")
message("Models exist.")
EMBED_TARGET(YUKARIN_S "${MODEL_DIR}/yukarin_s.onnx" "core")
EMBED_TARGET(YUKARIN_SA "${MODEL_DIR}/yukarin_sa.onnx" "core")
EMBED_TARGET(DECODE "${MODEL_DIR}/decode.onnx" "core")
EMBED_TARGET(METAS "${MODEL_DIR}/metas.json" "core")
EMBED_TARGET(YUKARIN_S "${MODEL_DIR}/yukarin_s.onnx")
EMBED_TARGET(YUKARIN_SA "${MODEL_DIR}/yukarin_sa.onnx")
EMBED_TARGET(DECODE "${MODEL_DIR}/decode.onnx")
EMBED_TARGET(METAS "${MODEL_DIR}/metas.json")
else()
message(FATAL_ERROR "Unable to find Model. Use option -DMODEL_DIR=...")
endif()
Expand Down
8 changes: 6 additions & 2 deletions core/src/embedBin/FindEmbed.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct Res {
}\;"
)

macro(EMBED_TARGET Name Input LibName)
macro(EMBED_TARGET Name Input)
get_filename_component(InputAbs "${Input}" REALPATH)
if(WIN32)
set(OutputRC "${CMAKE_CURRENT_BINARY_DIR}/${Name}.rc")
Expand All @@ -45,7 +45,11 @@ macro(EMBED_TARGET Name Input LibName)
"#include \"windows.h\"
${STRUCT}
struct Res ${Name}(void) {
HMODULE handle = GetModuleHandle(\"${LibName}\")\;
HMODULE handle = NULL\;
GetModuleHandleEx(
GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
| GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
(LPCTSTR)${Name}, &handle)\;
HRSRC res = FindResource(handle, MAKEINTRESOURCE(${RES_ID}), RT_RCDATA)\;
struct Res r = {
(const char*) LockResource(LoadResource(handle, res)),
Expand Down