mirror of https://github.com/oxen-io/lokinet
update for win32 parts
This commit is contained in:
parent
3174e581b7
commit
4c1ac0e991
|
@ -211,7 +211,10 @@ endif(JEMALLOC)
|
||||||
|
|
||||||
# FS_LIB should resolve to nothing on all other platforms
|
# FS_LIB should resolve to nothing on all other platforms
|
||||||
# it is only required on win32 -rick
|
# it is only required on win32 -rick
|
||||||
set(LIBS ${MALLOC_LIB} ${FS_LIB} uv)
|
set(LIBS ${MALLOC_LIB} ${FS_LIB})
|
||||||
|
if(NOT WIN32)
|
||||||
|
set(LIBS ${LIBS} uv)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
list(APPEND LIBS log)
|
list(APPEND LIBS log)
|
||||||
|
|
|
@ -4,4 +4,6 @@ add_library(${ABYSS_LIB} "${CMAKE_CURRENT_SOURCE_DIR}/src/md5.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/server.cpp")
|
"${CMAKE_CURRENT_SOURCE_DIR}/src/server.cpp")
|
||||||
|
|
||||||
target_include_directories(${ABYSS_LIB} PUBLIC include)
|
target_include_directories(${ABYSS_LIB} PUBLIC include)
|
||||||
target_link_libraries(${ABYSS_LIB} PUBLIC ${PLATFORM_LIB} uv)
|
if(NOT WIN32)
|
||||||
|
target_link_libraries(${ABYSS_LIB} PUBLIC ${PLATFORM_LIB} uv)
|
||||||
|
endif()
|
|
@ -76,16 +76,18 @@ set(LIB_PLATFORM_SRC
|
||||||
# tun
|
# tun
|
||||||
${LIBTUNTAP_SRC}
|
${LIBTUNTAP_SRC}
|
||||||
${EV_SRC}
|
${EV_SRC}
|
||||||
ev/ev_libuv.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(LIB_PLATFORM_SRC
|
set(LIB_PLATFORM_SRC
|
||||||
${LIB_PLATFORM_SRC}
|
${LIB_PLATFORM_SRC}
|
||||||
win32/win32_inet.c
|
win32/win32_inet.c
|
||||||
win32/win32_intrnl.c
|
win32/win32_intrnl.c
|
||||||
win32/win32_upoll.c
|
win32/win32_upoll.c)
|
||||||
)
|
else()
|
||||||
|
set(LIB_PLATFORM_SRC
|
||||||
|
${LIB_PLATFORM_SRC}
|
||||||
|
ev/ev_libuv.cpp)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
|
||||||
if (SOLARIS)
|
if (SOLARIS)
|
||||||
|
|
Loading…
Reference in New Issue