diff --git a/.gitmodules b/.gitmodules index 750c9a0..ce87b05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/nanopb/nanopb.git [submodule "third-party/jerasure"] path = third-party/jerasure - url = git@github.com:thestr4ng3r/jerasure.git + url = https://github.com/thestr4ng3r/jerasure.git [submodule "third-party/gf-complete"] path = third-party/gf-complete - url = git@github.com:thestr4ng3r/gf-complete.git + url = https://github.com/thestr4ng3r/gf-complete.git diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b4aa069 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,48 @@ + +language: cpp + +matrix: + include: + - os: linux + dist: bionic + addons: + apt: + sources: + - sourceline: "ppa:beineri/opt-qt-5.12.0-bionic" + packages: + - libprotoc-dev + - protobuf-compiler + - python3-protobuf + - libopus-dev + - qt512base + - qt512multimedia + - qt512gamepad + - qt512svg + - libgl1-mesa-dev + - libavcodec-dev + env: + - CMAKE_PREFIX_PATH="/opt/qt512" + + - os: osx + osx_image: xcode11 + addons: + homebrew: + packages: + - qt + - opus + - openssl@1.1 + - ffmpeg + env: + - CMAKE_PREFIX_PATH="/usr/local/opt/openssl@1.1;/usr/local/opt/qt" + +script: + - mkdir build && cd build + - cmake + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH + -DCHIAKI_ENABLE_TESTS=ON + -DCHIAKI_ENABLE_CLI=OFF + -DCHIAKI_GUI_ENABLE_QT_GAMEPAD=ON + .. + - make -j4 + - test/chiaki-unit diff --git a/CMakeLists.txt b/CMakeLists.txt index 81c264f..f8f3f5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ project(chiaki) option(CHIAKI_ENABLE_TESTS "Enable tests for Chiaki" ON) option(CHIAKI_ENABLE_CLI "Enable CLI for Chiaki" OFF) +option(CHIAKI_GUI_ENABLE_QT_GAMEPAD "Use QtGamepad for Input" ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 30a311d..94fc341 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,6 +1,4 @@ -option(CHIAKI_GUI_ENABLE_QT_GAMEPAD "Use QtGamepad for Input" ON) - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) diff --git a/lib/protobuf/CMakeLists.txt b/lib/protobuf/CMakeLists.txt index 33fd5bb..d4d28f3 100644 --- a/lib/protobuf/CMakeLists.txt +++ b/lib/protobuf/CMakeLists.txt @@ -2,7 +2,7 @@ find_package(Protobuf REQUIRED) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/takion.pb" - COMMAND protobuf::protoc "-o${CMAKE_CURRENT_BINARY_DIR}/takion.pb" takion.proto "-I${CMAKE_CURRENT_SOURCE_DIR}" + COMMAND protobuf::protoc "-o${CMAKE_CURRENT_BINARY_DIR}/takion.pb" "${CMAKE_CURRENT_SOURCE_DIR}/takion.proto" "-I${CMAKE_CURRENT_SOURCE_DIR}" MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/takion.proto") set(SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/takion.pb.c")