From fe38e25360a6d7d86068ab89c9260b500da568cb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 28 Nov 2019 15:52:43 +0800 Subject: [PATCH] 1 --- server/tools/scripts/ci/wsproxy/boundle.sh | 6 +++--- server/tools/scripts/ci/wsproxy/reload.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/tools/scripts/ci/wsproxy/boundle.sh b/server/tools/scripts/ci/wsproxy/boundle.sh index f3e5ef3..a8801b5 100644 --- a/server/tools/scripts/ci/wsproxy/boundle.sh +++ b/server/tools/scripts/ci/wsproxy/boundle.sh @@ -1,8 +1,8 @@ source ./common.sh -cd third_party/wsproxy/server/wsproxy -python ../tools/scripts/construct/build_pb.py --nohooks 1 -cmake -DGAME_ID=${GAME_ID} -DMASTER_MODE=1 . +cd ${SOURCE_PATH} +${PRE_COMPILE_CMD} +cmake ${COMPILE_FLAGS} make clean make cp ../bin/${SRC_EXE_NAME} ../../../../bin/${PROJECT_NAME} diff --git a/server/tools/scripts/ci/wsproxy/reload.sh b/server/tools/scripts/ci/wsproxy/reload.sh index 18a4745..38c7f0e 100644 --- a/server/tools/scripts/ci/wsproxy/reload.sh +++ b/server/tools/scripts/ci/wsproxy/reload.sh @@ -1,2 +1,2 @@ source ./common.sh -echo ${PROJECT_NAME} +echo ${COMPILE_FLAGS}