octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix path for travis upload

This commit is contained in:
B3n30 2017-11-16 19:28:15 +01:00
parent b3cdf30c65
commit d4cc0d8148
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/linux/upload.sh
View File

@ -9,7 +9,7 @@ COMPRESSION_FLAGS="-cJvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/citra/citra "$REV_NAME" cp build/src/citra/citra "$REV_NAME"
cp build/src/citra/citra-room "$REV_NAME" cp build/src/dedicated_room/citra-room "$REV_NAME"
cp build/src/citra_qt/citra-qt "$REV_NAME" cp build/src/citra_qt/citra-qt "$REV_NAME"
# We need icons on Linux for .desktop entries # We need icons on Linux for .desktop entries

2
.travis/macos/upload.sh
View File

@ -10,7 +10,7 @@ mkdir "$REV_NAME"
cp build/src/citra/citra "$REV_NAME" cp build/src/citra/citra "$REV_NAME"
cp -r build/src/citra_qt/citra-qt.app "$REV_NAME" cp -r build/src/citra_qt/citra-qt.app "$REV_NAME"
cp build/src/citra/citra-room "$REV_NAME" cp build/src/dedicated_room/citra-room "$REV_NAME"
# move qt libs into app bundle for deployment # move qt libs into app bundle for deployment
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"

7
src/dedicated_room/CMakeLists.txt
View File

@ -1,13 +1,12 @@
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
set(SRCS add_executable(citra-room
citra-room.cpp citra-room.cpp
citra-room.rc citra-room.rc
) )
create_directory_groups(${SRCS}) create_target_directory_groups(citra-room)
add_executable(citra-room ${SRCS})
target_link_libraries(citra-room PRIVATE common core network) target_link_libraries(citra-room PRIVATE common core network)
target_link_libraries(citra-room PRIVATE glad) target_link_libraries(citra-room PRIVATE glad)
if (MSVC) if (MSVC)