diff --git a/CMakeLists.txt b/CMakeLists.txt index b29fbdd7..cd72ee2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows") aux_source_directory(win3rd/posix POSIX_SRC) add_subdirectory(win3rd/pthread-win32) add_library(liblua SHARED ${LUA_LIB_SRC}) + target_include_directories(liblua PRIVATE skynet/skynet-src) add_library(libposix SHARED ${POSIX_SRC}) target_compile_definitions(libposix PRIVATE POSIX_LIBRARY) @@ -53,6 +54,17 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows") add_executable(skynet skynet/skynet-src/skynet_main.c) target_link_libraries(skynet ws2_32 liblua libposix libskynet pthreadVC3) + # 重新设置动态库输出路径 + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/skynet/3rd/lua) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/skynet/3rd/lua) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + # 编译 lua 可执行文件 + add_executable(lua skynet/3rd/lua/lua.c) + add_library(lualibb SHARED ${LUA_LIB_SRC}) + target_include_directories(lualibb PRIVATE skynet/skynet-src) + target_link_libraries(lua lualibb) + # 重新设置动态库输出路径 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/skynet/luaclib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) diff --git a/win3rd/openssl/lib/linux/.gitkeep b/win3rd/openssl/lib/linux/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/win3rd/openssl/lib/linux/libcrypto.a b/win3rd/openssl/lib/linux/libcrypto.a deleted file mode 100644 index 885c0a40..00000000 Binary files a/win3rd/openssl/lib/linux/libcrypto.a and /dev/null differ diff --git a/win3rd/openssl/lib/linux/libssl.a b/win3rd/openssl/lib/linux/libssl.a deleted file mode 100644 index afb69860..00000000 Binary files a/win3rd/openssl/lib/linux/libssl.a and /dev/null differ diff --git a/win3rd/openssl/lib/mac/.gitkeep b/win3rd/openssl/lib/mac/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/win3rd/openssl/lib/mac/libcrypto.a b/win3rd/openssl/lib/mac/libcrypto.a deleted file mode 100644 index d83524f3..00000000 Binary files a/win3rd/openssl/lib/mac/libcrypto.a and /dev/null differ diff --git a/win3rd/openssl/lib/mac/libssl.a b/win3rd/openssl/lib/mac/libssl.a deleted file mode 100644 index 5fdfaf06..00000000 Binary files a/win3rd/openssl/lib/mac/libssl.a and /dev/null differ