Merge branch 'master' of https://github.com/fasiondog/hikyuu into feature/draw

This commit is contained in:
fasiondog 2023-09-20 00:34:35 +08:00
commit 02d6ace0b3
6 changed files with 12 additions and 4 deletions

View File

@ -30,8 +30,8 @@ else
end
if is_plat("windows") then
add_defines("HKU_API=__declspec(dllexport)")
if is_mode("release") then
add_defines("HKU_API=__declspec(dllexport)")
add_packages("hdf5")
else
add_packages("hdf5_D")

View File

@ -21,7 +21,9 @@ target("hkuserver")
end
if is_plat("windows") then
add_defines("HKU_API=__declspec(dllimport)")
if is_mode("release") then
add_defines("HKU_API=__declspec(dllimport)")
end
add_packages("mysql")
end

View File

@ -123,3 +123,8 @@ target("small-test")
after_run(coverage_report)
target_end()
target("prepare-test")
set_kind("phony")
set_default(false)
target_end()

View File

@ -21,7 +21,7 @@ target("core")
set_filename("core.so")
end
if is_plat("windows") then
if is_plat("windows") and is_mode("release") then
add_defines("HKU_API=__declspec(dllimport)")
add_cxflags("-wd4566")
end

View File

@ -8,7 +8,7 @@ function main(target)
if not with_demo then raise("You need to config first: xmake f --with-demo=y") end
end
if "unit-test" == targetname or "small-test" == targetname then
if "unit-test" == targetname or "small-test" == targetname or "prepare-test" == targetname then
print("copying test_data ...")
os.rm("$(buildir)/$(mode)/$(plat)/$(arch)/lib/test_data")
os.cp("$(projectdir)/test_data", "$(buildir)/$(mode)/$(plat)/$(arch)/lib/")

View File

@ -65,6 +65,7 @@ end
add_requires("myboost " .. boost_version, {
system = false,
alias = "boost",
debug = is_mode("debug"),
configs = {
shared = is_plat("windows") and true or false,
data_time = true,