Merge pull request #332 from jianghaiwu/master-new

Merge to master

BuildScript/linux/BuildNF.CMake.Debug.sh

@@ -2,11 +2,7 @@ mkdir Build.Linux.Debug
 
 cd Build.Linux.Debug
 
-if [ "$1" == 'BUILD_MID_WARE' ] ; then
-cmake ../../../ -G "CodeBlocks - Unix Makefiles"  -DBUILD_MID_WARE_SDK=ON -DCMAKE_BUILD_TYPE=Debug
-else
 cmake ../../../ -G "CodeBlocks - Unix Makefiles" -DBUILD_MID_WARE_SDK=OFF -DCMAKE_BUILD_TYPE=Debug
-fi
 
 make
 cd ../

BuildScript/linux/BuildNF.CMake.Release.sh

@@ -2,11 +2,7 @@ mkdir Build.Linux.Release
 
 cd Build.Linux.Release
 
-if [ "$1" == 'BUILD_MID_WARE' ] ; then
-cmake ../../../ -G "CodeBlocks - Unix Makefiles"  -DBUILD_MID_WARE_SDK=ON -DCMAKE_BUILD_TYPE=Release
-else
 cmake ../../../ -G "CodeBlocks - Unix Makefiles" -DBUILD_MID_WARE_SDK=OFF -DCMAKE_BUILD_TYPE=Release
-fi
 
 make
 cd ../

README.md

@@ -1,3 +1,7 @@
+# 2021.7.9 在新西兰奥克兰的一场车祸中，ketoo 永远离开了我们。
+# On July 9, 2021, ketoo left us forever in a car accident in Auckland, New Zealand.
+# 由于mater有权限合并了， master-new 分支后续不再维护。 直接维护master即可，pr也提交到master即可
+# Since mater has permission to merge, the master-new branch will no longer be maintained. You can directly maintain the master, and the pr can also be submitted to the master
 # NoahGameFrame
 
 

buildServer.sh

@@ -7,38 +7,35 @@
 #compile dep libraries
 
 #example 1: ./buildServer
-#example 2: ./buildServer BUILD_MID_WARE DEBUG
-#example 3: ./buildServer BUILD_MID_WARE
+#example 2: ./buildServer DEBUG
+
+
+echo "we only build NF SDK here"
+cd NFComm/NFMessageDefine
+./cpp.sh
+cd ../../
+
+cd BuildScript/linux/
+chmod -R 755 ./BuildNF.CMake.Tools.sh
+./BuildNF.CMake.Tools.sh
+cd ../../
+
+cd _Out/NFDataCfg/Tool/
+chmod 755 ./NFFileProcess
+chmod 755 ./copy_files.sh
+./copy_files.sh
+cd ..
+cd ..
+cd ..
 
-if [ "$1" == "BUILD_MID_WARE" ]; then
-   echo "we dont need to compile message and tools again"
-else
-   echo "we only build NF SDK here"
-    cd NFComm/NFMessageDefine
-    ./cpp.sh
-    cd ../../
-
-    cd BuildScript/linux/
-    chmod -R 755 ./BuildNF.CMake.Tools.sh
-    ./BuildNF.CMake.Tools.sh
-    cd ../../
-
-    cd _Out/NFDataCfg/Tool/
-    chmod 755 ./NFFileProcess
-    chmod 755 ./copy_files.sh
-    ./copy_files.sh
-    cd ..
-    cd ..
-    cd ..
-fi
 
-if [ "$2" == "DEBUG" ]; then
+if [ "$1" == "DEBUG" ]; then
 rm -rf ./_Out/Debug/NFServer
 rm -rf ./_Out/Debug/*.a
 
 cd BuildScript/linux/
 chmod -R 755 ./BuildNF.CMake.Debug.sh
-time ./BuildNF.CMake.Debug.sh  $1
+time ./BuildNF.CMake.Debug.sh  
 
 else
 
@@ -47,7 +44,7 @@ rm -rf ./_Out/Release/*.a
 
 cd BuildScript/linux/
 chmod -R 755 ./BuildNF.CMake.Release.sh
-time ./BuildNF.CMake.Release.sh  $1
+time ./BuildNF.CMake.Release.sh 
 fi
 
 cd ../../