- better CMake
This commit is contained in:
parent
cc9565c13e
commit
b2c6221eb4
|
|
@ -10,18 +10,19 @@ if (CMAKE_SYSTEM MATCHES "Linux*")
|
||||||
|
|
||||||
# uuid
|
# uuid
|
||||||
set (UUID_LIB ${CMAKE_CURRENT_LIST_DIR}/uuid/lib/lin64/libuuid.a)
|
set (UUID_LIB ${CMAKE_CURRENT_LIST_DIR}/uuid/lib/lin64/libuuid.a)
|
||||||
<<<<<<< Updated upstream
|
|
||||||
set (UUID_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/uuid/include)
|
set (UUID_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/uuid/include)
|
||||||
|
|
||||||
# event2
|
# event2
|
||||||
set (EVENT2_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/event2/include)
|
set (EVENT2_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/event2/include)
|
||||||
set (EVENT2_LIB ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent.a)
|
set (EVENT2_LIB ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent.a)
|
||||||
set (EVENT2_LIB_CORE ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_core.a)
|
set (EVENT2_LIB_CORE ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_core.a)
|
||||||
set (EVENT2_LIB_EXTRA ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_extra.a)
|
set (EVENT2_LIB_EXTRA ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_extra.a)
|
||||||
set (EVENT2_LIB_PTHREADS ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_pthreads.a)
|
set (EVENT2_LIB_PTHREADS ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_pthreads.a)
|
||||||
set (EVENT2_LIB_OPENSSL ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_openssl.a)
|
set (EVENT2_LIB_OPENSSL ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_openssl.a)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set (EVENT2_LIBS ${EVENT2_LIB} ${EVENT2_LIB_CORE} ${EVENT2_LIB_EXTRA} ${EVENT2_LIB_PTHREADS})
|
||||||
|
|
||||||
if (CMAKE_SYSTEM MATCHES "Windows*")
|
if (CMAKE_SYSTEM MATCHES "Windows*")
|
||||||
set (SNDFILE_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/sndfile/include)
|
set (SNDFILE_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/sndfile/include)
|
||||||
set (SNDFILE_LIBS ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/flac.lib
|
set (SNDFILE_LIBS ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/flac.lib
|
||||||
|
|
@ -31,7 +32,7 @@ if (CMAKE_SYSTEM MATCHES "Windows*")
|
||||||
${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbis.lib
|
${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbis.lib
|
||||||
${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisfile.lib
|
${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisfile.lib
|
||||||
${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisenc.lib)
|
${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisenc.lib)
|
||||||
=======
|
endif()
|
||||||
|
|
||||||
# Opus
|
# Opus
|
||||||
set (OPUS_LIB ${CMAKE_CURRENT_LIST_DIR}/opus/linux/libopus.a)
|
set (OPUS_LIB ${CMAKE_CURRENT_LIST_DIR}/opus/linux/libopus.a)
|
||||||
|
|
@ -40,5 +41,3 @@ if (CMAKE_SYSTEM MATCHES "Windows*")
|
||||||
# Portaudio
|
# Portaudio
|
||||||
set (PORTAUDIO_LIB ${CMAKE_CURRENT_LIST_DIR}/portaudio/linux/x64/libportaudio.a)
|
set (PORTAUDIO_LIB ${CMAKE_CURRENT_LIST_DIR}/portaudio/linux/x64/libportaudio.a)
|
||||||
set (PORTAUDIO_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/portaudio/include)
|
set (PORTAUDIO_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/portaudio/include)
|
||||||
>>>>>>> Stashed changes
|
|
||||||
endif()
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue