mirror of
https://gitee.com/fasiondog/hikyuu.git
synced 2024-11-30 02:48:57 +08:00
Merge branch 'master' of https://github.com/fasiondog/hikyuu into feature/draw
This commit is contained in:
commit
02d6ace0b3
@ -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")
|
||||
|
@ -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
|
||||
|
||||
|
@ -123,3 +123,8 @@ target("small-test")
|
||||
|
||||
after_run(coverage_report)
|
||||
target_end()
|
||||
|
||||
target("prepare-test")
|
||||
set_kind("phony")
|
||||
set_default(false)
|
||||
target_end()
|
@ -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
|
||||
|
@ -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/")
|
||||
|
Loading…
Reference in New Issue
Block a user