使用新版本cyclone
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
set(WTL_DIR $ENV{LIBRARIES_SDK_ROOT}/wtl)
|
set(WTL_DIR $ENV{LIBRARIES_SDK_ROOT}/wtl)
|
||||||
|
|
||||||
set(CYCLONE_DIR $ENV{CYCLONE_SDK_ROOT})
|
set(cyclone_DIR $ENV{CYCLONE_SDK_ROOT}/lib/cmake/cyclone)
|
||||||
|
find_package(cyclone REQUIRED)
|
||||||
|
|
||||||
set(RapidJSON_DIR $ENV{LIBRARIES_SDK_ROOT}/rapidjson/cmake)
|
set(RapidJSON_DIR $ENV{LIBRARIES_SDK_ROOT}/rapidjson/cmake)
|
||||||
find_package(RapidJSON REQUIRED)
|
find_package(RapidJSON REQUIRED)
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ bool AceClientInterface::init()
|
|||||||
if(ret!= ACE_SDK_RESULT_OK)
|
if(ret!= ACE_SDK_RESULT_OK)
|
||||||
{
|
{
|
||||||
printf(">>ACE fail to init ace sdk client, ret : %d\n", ret);
|
printf(">>ACE fail to init ace sdk client, ret : %d\n", ret);
|
||||||
|
char szTemp[256];
|
||||||
|
snprintf(szTemp, sizeof(szTemp), "Failed to init ACE SDK client! Error code: %x", ret);
|
||||||
|
MessageBoxA(NULL, szTemp, "Error", MB_OK | MB_ICONERROR);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -52,20 +52,14 @@ target_include_directories(aClient
|
|||||||
PRIVATE
|
PRIVATE
|
||||||
${ACE_CLIENT_DIR}/include
|
${ACE_CLIENT_DIR}/include
|
||||||
${WTL_DIR}/include
|
${WTL_DIR}/include
|
||||||
${CYCLONE_DIR}/include
|
|
||||||
${GAME_PROTO_DIR}
|
${GAME_PROTO_DIR}
|
||||||
${TENCENT_NETBAR_SDK}/include
|
${TENCENT_NETBAR_SDK}/include
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_directories(aClient
|
|
||||||
PRIVATE
|
|
||||||
${CYCLONE_DIR}/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries(aClient
|
target_link_libraries(aClient
|
||||||
PRIVATE
|
PRIVATE
|
||||||
aGameProto
|
aGameProto
|
||||||
cyclone.lib
|
cyclone::cyclone
|
||||||
ws2_32.lib
|
ws2_32.lib
|
||||||
shlwapi.lib
|
shlwapi.lib
|
||||||
winmm.lib
|
winmm.lib
|
||||||
|
|||||||
@@ -14,12 +14,10 @@ protobuf_generate(
|
|||||||
target_include_directories(aGameProto
|
target_include_directories(aGameProto
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
|
|
||||||
PRIVATE
|
|
||||||
${CYCLONE_DIR}/include
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(aGameProto
|
target_link_libraries(aGameProto
|
||||||
PUBLIC
|
PUBLIC
|
||||||
protobuf::libprotobuf
|
protobuf::libprotobuf
|
||||||
|
cyclone::cyclone
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -41,22 +41,16 @@ add_executable(aServer
|
|||||||
|
|
||||||
target_include_directories(aServer
|
target_include_directories(aServer
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${CYCLONE_DIR}/include
|
|
||||||
${ACE_SERVER_DIR}/include
|
${ACE_SERVER_DIR}/include
|
||||||
${RAPIDJSON_INCLUDE_DIRS}
|
${RAPIDJSON_INCLUDE_DIRS}
|
||||||
${GAME_PROTO_DIR}
|
${GAME_PROTO_DIR}
|
||||||
../../libTinyEncrypt
|
../../libTinyEncrypt
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_directories(aServer
|
|
||||||
PRIVATE
|
|
||||||
${CYCLONE_DIR}/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries(aServer
|
target_link_libraries(aServer
|
||||||
PRIVATE
|
PRIVATE
|
||||||
aGameProto
|
aGameProto
|
||||||
cyclone.lib
|
cyclone::cyclone
|
||||||
ws2_32.lib
|
ws2_32.lib
|
||||||
shlwapi.lib
|
shlwapi.lib
|
||||||
CURL::libcurl_static
|
CURL::libcurl_static
|
||||||
|
|||||||
Reference in New Issue
Block a user