format

add document for protocol
ketoo · Feb 4, 2017 · d439526 · d439526
1 parent 29a27a8
commit d439526
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 7 deletions.
diff --git a/BuildScript/linux/BuildNF.CMake.Debug.sh b/BuildScript/linux/BuildNF.CMake.Debug.sh
diff --git a/BuildScript/linux/BuildNF.CMake.Release.sh b/BuildScript/linux/BuildNF.CMake.Release.sh
diff --git a/BuildScript/linux/BuildNF.CMake.Tools.sh b/BuildScript/linux/BuildNF.CMake.Tools.sh
diff --git a/BuildScript/linux/BuildNF.Tools.Linux.Debug.sh b/BuildScript/linux/BuildNF.Tools.Linux.Debug.sh
diff --git a/GenerateConfigXML.sh b/GenerateConfigXML.sh
diff --git a/NFComm/NFMysqlPlugin/CMakeLists.txt b/NFComm/NFMysqlPlugin/CMakeLists.txt
@@ -7,18 +7,16 @@ if(UNIX)
 	add_library(NFMysqlPlugin SHARED
 		${NFMysqlPlugin_ROOT_Cpp}
 		${NFMysqlPlugin_ROOT_CC}
-		${NFMysqlPlugin_ROOT_Hpp}
-		${SolutionDir}/Dependencies/redis-cplusplus-client/anet.c
-		${SolutionDir}/Dependencies/redis-cplusplus-client/anet.h)
+		${NFMysqlPlugin_ROOT_Hpp})
 	target_include_directories(NFMysqlPlugin PUBLIC
 		${SolutionDir}/Dependencies/mysql/
 		${SolutionDir}/Dependencies/mysqlpp/)
 	if (CMAKE_BUILD_TYPE MATCHES "Release")
-		target_link_libraries(NFMysqlPlugin mysqlclient.a)
-		target_link_libraries(NFMysqlPlugin libmysqlpp.a)
+		target_link_libraries(NFMysqlPlugin ../../Dependencies/lib/mysqlclient.a)
+		target_link_libraries(NFMysqlPlugin ../../Dependencies/lib/libmysqlpp.a)
 	else()
-		target_link_libraries(NFMysqlPlugin mysqlclient.a)
-		target_link_libraries(NFMysqlPlugin libmysqlpp.a)
+		target_link_libraries(NFMysqlPlugin ../../Dependencies/lib/mysqlclient.a)
+		target_link_libraries(NFMysqlPlugin ../../Dependencies/lib/libmysqlpp.a)
 	endif()
 	add_definitions(
 			-D_USRDLL

diff --git a/_Out/NFDataCfg/Tool/copy_files.sh b/_Out/NFDataCfg/Tool/copy_files.sh
diff --git a/_Out/Tester/rund_game.sh b/_Out/Tester/rund_game.sh
diff --git a/_Out/Tester/rund_login.sh b/_Out/Tester/rund_login.sh
diff --git a/_Out/Tester/rund_master.sh b/_Out/Tester/rund_master.sh
diff --git a/_Out/Tester/rund_proxy.sh b/_Out/Tester/rund_proxy.sh
diff --git a/_Out/Tester/rund_world.sh b/_Out/Tester/rund_world.sh
diff --git a/_Out/Tester/rundx_game.sh b/_Out/Tester/rundx_game.sh
diff --git a/_Out/Tester/rundx_login.sh b/_Out/Tester/rundx_login.sh
diff --git a/_Out/Tester/rundx_master.sh b/_Out/Tester/rundx_master.sh
diff --git a/_Out/Tester/rundx_proxy.sh b/_Out/Tester/rundx_proxy.sh
diff --git a/_Out/Tester/rundx_world.sh b/_Out/Tester/rundx_world.sh
diff --git a/_Out/clearlog.sh b/_Out/clearlog.sh
diff --git a/_Out/kill.sh b/_Out/kill.sh
diff --git a/_Out/rund.sh b/_Out/rund.sh
diff --git a/_Out/runr.sh b/_Out/runr.sh
diff --git a/_Out/runtutoriald.sh b/_Out/runtutoriald.sh
diff --git a/_Out/runxd.sh b/_Out/runxd.sh
diff --git a/_Out/runxr.sh b/_Out/runxr.sh