From 3ab8d6a9228ef07a33e215da20bb5c754fcf0061 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 15 Jun 2020 17:56:33 +0100 Subject: [PATCH 1/3] readme: ubuntu docs --- README.md | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 33eaea6..5064417 100644 --- a/README.md +++ b/README.md @@ -6,24 +6,38 @@ Live Video Mixer v-mix is the successor for GLMixer - https://sourceforge.net/projects/glmixer/ -### Clone +## Clone -git clone --recursive https://github.com/brunoherbelin/vimix.git + git clone --recursive https://github.com/brunoherbelin/vimix.git -### Compile +## Compile +``` cmake -G Ninja - ninja +``` ### Dependencies -Compiling tools: +**Compiling tools:** -gcc, cmake & Ninja +- gcc +- cmake +- Ninja -Libraries: +**Libraries:** -gstreamer -libpng -libglfw3 +- gstreamer +- libpng +- libglfw3 + + +#### Ubuntu + +**tools:** + + apt-get install build-essential cmake ninja-build + +**libs:** + + apt-get install libpng-dev libglfw3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev From 305494567bc12523f800c93f5e76446c0f2eecc2 Mon Sep 17 00:00:00 2001 From: Markus Walther Date: Mon, 15 Jun 2020 18:31:49 +0100 Subject: [PATCH 2/3] git: ignore build outputs --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index 02821b4..9cb7579 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,16 @@ /CMakeLists.txt.user +CMakeCache.txt +CMakeFiles/ +.ninja_deps +.ninja_log +__cmrc_vmix-resources/ +_cmrc/ +build.ninja +cmake_install.cmake +libGLAD.a +libIMGUI.a +libTINYFD.a +libTINYXML2.a +libvmix-resources.a +rules.ninja +/vmix From 9ecdbc51bc7a65962a6cfbb2946e521d5c04c8cb Mon Sep 17 00:00:00 2001 From: Markus Walther Date: Mon, 15 Jun 2020 19:12:01 +0100 Subject: [PATCH 3/3] ci: build on travis --- .travis.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..28e9f38 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,36 @@ +language: cpp +dist: focal + +matrix: + include: + - os: linux + addons: + apt: + packages: + - build-essential + - cmake + - ninja-build + - libpng-dev + - libglfw3-dev + - libgstreamer1.0-dev + - libgstreamer-plugins-base1.0-dev + - libxrandr-dev + + # - os: osx + # osx_image: xcode11.5 + # addons: + # homebrew: + # update: true + # packages: + # - cmake + # - ninja + # - libpng + # - glfw + # - gstreamer + # - gst-plugins-base + # env: + # - CXX_COMPILER=clang++ + +script: + - cmake -G Ninja + - ninja