diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 08eaf6f..86124e5 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -81,20 +81,40 @@ add_custom_command(TARGET script_pb_protocol ) add_dependencies(gameserver script_pb_protocol) -target_link_libraries( - gameserver - pthread - mysqlclient - protobuf - rt - dl - util - crypto - ssl - jsoncpp - curl - hiredis - tinyxml2 - tcmalloc - behaviac_gcc_release -) +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + target_link_libraries( + gameserver + pthread + mysqlclient + protobuf + rt + dl + util + crypto + ssl + jsoncpp + curl + hiredis + tinyxml2 + tcmalloc + behaviac_gcc_debug + ) +else() + target_link_libraries( + gameserver + pthread + mysqlclient + protobuf + rt + dl + util + crypto + ssl + jsoncpp + curl + hiredis + tinyxml2 + tcmalloc + behaviac_gcc_release + ) +endif() diff --git a/third_party/behaviac b/third_party/behaviac index b9f2f20..2404145 160000 --- a/third_party/behaviac +++ b/third_party/behaviac @@ -1 +1 @@ -Subproject commit b9f2f205afe3226fa06b6a3b9e62fcd6eaca63b8 +Subproject commit 240414570ee2848291d24ff8d3102dc43d4104a3