diff --git a/ace_test/CMakeLists.txt b/ace_test/CMakeLists.txt index 177761d..bf97178 100644 --- a/ace_test/CMakeLists.txt +++ b/ace_test/CMakeLists.txt @@ -1,6 +1,7 @@ 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) find_package(RapidJSON REQUIRED) diff --git a/ace_test/aClient/AceClientInterface.cpp b/ace_test/aClient/AceClientInterface.cpp index 18dace3..c30ad20 100644 --- a/ace_test/aClient/AceClientInterface.cpp +++ b/ace_test/aClient/AceClientInterface.cpp @@ -21,6 +21,9 @@ bool AceClientInterface::init() if(ret!= ACE_SDK_RESULT_OK) { 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 true; diff --git a/ace_test/aClient/CMakeLists.txt b/ace_test/aClient/CMakeLists.txt index 1453840..1e02a02 100644 --- a/ace_test/aClient/CMakeLists.txt +++ b/ace_test/aClient/CMakeLists.txt @@ -52,20 +52,14 @@ target_include_directories(aClient PRIVATE ${ACE_CLIENT_DIR}/include ${WTL_DIR}/include - ${CYCLONE_DIR}/include ${GAME_PROTO_DIR} ${TENCENT_NETBAR_SDK}/include ) -target_link_directories(aClient -PRIVATE - ${CYCLONE_DIR}/lib -) - target_link_libraries(aClient PRIVATE aGameProto - cyclone.lib + cyclone::cyclone ws2_32.lib shlwapi.lib winmm.lib diff --git a/ace_test/aCommon/proto/CMakeLists.txt b/ace_test/aCommon/proto/CMakeLists.txt index 9fc3fe9..12b7e41 100644 --- a/ace_test/aCommon/proto/CMakeLists.txt +++ b/ace_test/aCommon/proto/CMakeLists.txt @@ -14,12 +14,10 @@ protobuf_generate( target_include_directories(aGameProto PUBLIC ${CMAKE_CURRENT_BINARY_DIR} - -PRIVATE - ${CYCLONE_DIR}/include ) target_link_libraries(aGameProto PUBLIC protobuf::libprotobuf + cyclone::cyclone ) diff --git a/ace_test/aServer/CMakeLists.txt b/ace_test/aServer/CMakeLists.txt index bc02b81..d4ebfb8 100644 --- a/ace_test/aServer/CMakeLists.txt +++ b/ace_test/aServer/CMakeLists.txt @@ -41,22 +41,16 @@ add_executable(aServer target_include_directories(aServer PRIVATE - ${CYCLONE_DIR}/include ${ACE_SERVER_DIR}/include ${RAPIDJSON_INCLUDE_DIRS} ${GAME_PROTO_DIR} ../../libTinyEncrypt ) -target_link_directories(aServer -PRIVATE - ${CYCLONE_DIR}/lib -) - target_link_libraries(aServer PRIVATE aGameProto - cyclone.lib + cyclone::cyclone ws2_32.lib shlwapi.lib CURL::libcurl_static