- change : 修正 build 文件，并忽略新的编译包

2017-04-26 21:59:56 +08:00 · 2017-04-26 21:59:56 +08:00 · 144878a880
commit 144878a880
parent cddf9100b4
2 changed files with 4 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -35,19 +35,18 @@ Release/
 *.klg
 *.lkc

-<<<<<<< HEAD
 # 不想同步的
 *.local
 *.temp
 *.vt
 *.dat
-=======
 vn.ctp/build/*
 vn.lts/build/*
 .idea
->>>>>>> 65aac25731772259bf2d4049e7adbe92750ea01d
+.gitignore

 vn.trader/ctaAlgo/data/*
 vn.trader/build/*
 vn.trader/dist/*
 *.bak
+
--- a/vn.api/vn.ctp/build.sh
+++ b/vn.api/vn.ctp/build.sh
@ -12,6 +12,6 @@ cmake ..
 make VERBOSE=1 -j 1
 ln -fs `pwd`/lib/vnctpmd.so ../vnctpmd/test/vnctpmd.so
 ln -fs `pwd`/lib/vnctptd.so ../vnctptd/test/vnctptd.so
-cp ../vnctpmd/test/vnctpmd.* ../../vn.trader/ctpGateway/
-cp ../vnctptd/test/vnctptd.* ../../vn.trader/ctpGateway/
+cp ../vnctpmd/test/vnctpmd.* ../../vn.trader/gateway/ctpGateway/
+cp ../vnctptd/test/vnctptd.* ../../vn.trader/gateway/ctpGateway/
 popd