This commit is contained in:
恍兮惚兮 2024-11-15 07:00:09 +08:00
parent 1729eed5be
commit 4347d06137
8 changed files with 10 additions and 15 deletions

View File

@ -214,9 +214,9 @@ def buildPlugins(arch):
)
# subprocess.run(f"python copytarget.py 0")
elif arch == "xp":
url = "https://github.com/Chuyu-Team/YY-Thunks/releases/download/v1.0.7/YY-Thunks-1.0.7-Binary.zip"
os.system(rf"curl -SLo YY-Thunks-1.0.7-Binary.zip " + url)
os.system(rf"7z x -y YY-Thunks-1.0.7-Binary.zip -o../libs/YY-Thunks")
#url = "https://github.com/Chuyu-Team/YY-Thunks/releases/download/v1.0.7/YY-Thunks-1.0.7-Binary.zip"
#os.system(rf"curl -SLo YY-Thunks-1.0.7-Binary.zip " + url)
#os.system(rf"7z x -y YY-Thunks-1.0.7-Binary.zip -o../libs/YY-Thunks")
with open("do.bat", "w") as ff:
ff.write(
rf"""

View File

@ -51,4 +51,4 @@ target_precompile_headers(LunaHook REUSE_FROM pchhook)
set_target_properties(LunaHook PROPERTIES OUTPUT_NAME "LunaHook${bitappendix}")
target_link_libraries(LunaHook Version httpapi ws2_32 Shlwapi pch minhook commonengine utils ${YY_Thunks_for_WinXP})
target_link_libraries(LunaHook Version httpapi ws2_32 Shlwapi pch minhook commonengine utils)

View File

@ -21,13 +21,13 @@ target_include_directories(host PUBLIC .)
add_library(LunaHostDll MODULE LunaHostDll.cpp ${versioninfohost})
target_precompile_headers(LunaHostDll REUSE_FROM pch)
set_target_properties(LunaHostDll PROPERTIES OUTPUT_NAME "LunaHost${bitappendix}")
target_link_libraries(LunaHostDll pch host ${YY_Thunks_for_WinXP})
target_link_libraries(LunaHostDll pch host)
if(BUILD_CLI)
add_executable(LunaHostCLI LunaHostCLI.cpp ${versioninfohost})
target_precompile_headers(LunaHostCLI REUSE_FROM pch)
set_target_properties(LunaHostCLI PROPERTIES OUTPUT_NAME "LunaHostCLI${bitappendix}")
target_link_libraries(LunaHostCLI pch host ${YY_Thunks_for_WinXP})
target_link_libraries(LunaHostCLI pch host)
endif()
add_subdirectory(GUI)

View File

@ -3,7 +3,7 @@ if(BUILD_GUI)
add_executable(LunaHost WIN32 confighelper.cpp controls.cpp main.cpp processlistwindow.cpp LunaHost.cpp window.cpp ../../../exec/luna.rc pluginmanager.cpp Plugin/extensionimpl.cpp Plugin/copyclipboard.cpp QtLoader_inline.cpp app.manifest ${versioninfohost})
target_precompile_headers(LunaHost REUSE_FROM pch)
set_target_properties(LunaHost PROPERTIES OUTPUT_NAME "LunaHost${bitappendix}")
target_link_libraries(LunaHost comctl32 winhttp pch host ${YY_Thunks_for_WinXP} nlohmann)
target_link_libraries(LunaHost comctl32 winhttp pch host nlohmann)
endif()
if(BUILD_PLUGIN)

View File

@ -14,7 +14,7 @@ set(OpenCV_STATIC ON)
find_package(OpenCV REQUIRED)
add_library(LunaOCR SHARED OCR.cpp ${versioninfo})
target_link_libraries(LunaOCR ${OnnxRuntime_LIBS} ${OpenCV_LIBS} Clipper2Lib ${YY_Thunks_for_WinXP})
target_link_libraries(LunaOCR ${OnnxRuntime_LIBS} ${OpenCV_LIBS} Clipper2Lib)
target_precompile_headers(LunaOCR REUSE_FROM pch)
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)

View File

@ -25,8 +25,3 @@ target_precompile_headers(LunaTranslator_admin REUSE_FROM pch)
endif()
target_precompile_headers(LunaTranslator REUSE_FROM pch)
target_precompile_headers(LunaTranslator_debug REUSE_FROM pch)
if(WINXP)
target_link_libraries(LunaTranslator ${YY_Thunks_for_WinXP})
target_link_libraries(LunaTranslator_debug ${YY_Thunks_for_WinXP})
endif()

View File

@ -28,6 +28,6 @@ if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
set_target_properties(shareddllproxy PROPERTIES OUTPUT_NAME "shareddllproxy64")
else()
target_precompile_headers(voiceroid2 REUSE_FROM pch)
target_link_libraries(shareddllproxy nlohmann Mfplat mfuuid voiceroid2 Detours ${YY_Thunks_for_WinXP})
target_link_libraries(shareddllproxy nlohmann Mfplat mfuuid voiceroid2 Detours)
set_target_properties(shareddllproxy PROPERTIES OUTPUT_NAME "shareddllproxy32")
endif()

View File

@ -25,6 +25,6 @@ if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
target_link_libraries(wcocr ${CMAKE_SOURCE_DIR}/libs/wechat-ocr/spt/x64/libprotobuf-lite.lib ${CMAKE_SOURCE_DIR}/libs/wechat-ocr/spt/x64/mmmojo_64.lib)
target_link_options(wcocr PRIVATE "/DELAYLOAD:mmmojo_64.dll")
else()
target_link_libraries(wcocr ${CMAKE_SOURCE_DIR}/libs/wechat-ocr/spt/x86/libprotobuf-lite.lib ${CMAKE_SOURCE_DIR}/libs/wechat-ocr/spt/x86/mmmojo.lib ${YY_Thunks_for_WinXP})
target_link_libraries(wcocr ${CMAKE_SOURCE_DIR}/libs/wechat-ocr/spt/x86/libprotobuf-lite.lib ${CMAKE_SOURCE_DIR}/libs/wechat-ocr/spt/x86/mmmojo.lib)
target_link_options(wcocr PRIVATE "/DELAYLOAD:mmmojo.dll")
endif()