- better CMake file
This commit is contained in:
parent
a53a339867
commit
cc9565c13e
|
|
@ -10,6 +10,7 @@ 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
|
||||||
|
|
@ -30,4 +31,14 @@ 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)
|
||||||
|
=======
|
||||||
|
|
||||||
|
# Opus
|
||||||
|
set (OPUS_LIB ${CMAKE_CURRENT_LIST_DIR}/opus/linux/libopus.a)
|
||||||
|
set (OPUS_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/opus/include)
|
||||||
|
|
||||||
|
# Portaudio
|
||||||
|
set (PORTAUDIO_LIB ${CMAKE_CURRENT_LIST_DIR}/portaudio/linux/x64/libportaudio.a)
|
||||||
|
set (PORTAUDIO_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/portaudio/include)
|
||||||
|
>>>>>>> Stashed changes
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue