Fix mismatch name of variable

This commit is contained in:
loki
2020-01-30 06:39:12 -05:00
parent ab8b25901a
commit 439ddd8c41
2 changed files with 5 additions and 3 deletions

View File

@@ -164,8 +164,8 @@ else()
list(APPEND SUNSHINE_COMPILE_OPTIONS -O3)
endif()
if(NOT SUNSHINE_ROOT)
set(SUNSHINE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/assets")
if(NOT SUNSHINE_ASSETS_DIR)
set(SUNSHINE_ASSETS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
endif()
if(SUNSHINE_STANDALONE)
@@ -184,7 +184,7 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
${OPENSSL_LIBRARIES}
${PLATFORM_LIBRARIES})
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ROOT}")
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR}")
add_executable(sunshine ${SUNSHINE_TARGET_FILES})
target_link_libraries(sunshine ${SUNSHINE_EXTERNAL_LIBRARIES})
target_compile_definitions(sunshine PUBLIC ${SUNSHINE_DEFINITIONS})

View File

@@ -10,11 +10,13 @@ environment:
install:
- sh: sudo add-apt-repository ppa:hnakamur/icu
- sh: sudo add-apt-repository ppa:hnakamur/boost
- sh: sudo add-apt-repository ppa:savoury1/build-tools
- sh: sudo add-apt-repository ppa:savoury1/backports
- sh: sudo add-apt-repository ppa:savoury1/graphics
- sh: sudo add-apt-repository ppa:savoury1/multimedia
- sh: sudo add-apt-repository ppa:savoury1/ffmpeg4
- sh: sudo apt update
- sh: sudo apt install -y fakeroot cmake libssl-dev libavdevice-dev libboost-thread1.67-dev libboost-filesystem1.67-dev libboost-log1.67-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
- sh: sudo update-alternatives --set gcc /usr/bin/gcc-8