summary refs log tree commit diff
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-12-16 18:36:16 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-12-16 18:37:08 +0200
commit7e24a468b5762a1f40710eb4b4a7b522659567c7 (patch)
tree1872f8c8bddfb6aaeee23ffc8e47160b6d546cda
parentUpdate package.nix to include QT Multimedia (#165) (diff)
downloadnheko-7e24a468b5762a1f40710eb4b4a7b522659567c7.tar.xz
Remove submodules from matrix-structs
fixes #164
-rw-r--r--CMakeLists.txt2
-rw-r--r--Makefile3
m---------libs/matrix-structs0
3 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt

index de45f864..88750b7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -302,6 +302,8 @@ qt5_add_resources(LANG_QRC ${_qrc}) qt5_add_resources(QRC resources/res.qrc) add_subdirectory(libs/matrix-structs) +include_directories(${matrix_structs_SOURCE_DIR}/include) +include_directories(${matrix_structs_SOURCE_DIR}/deps) set(COMMON_LIBS matrix_structs Qt5::Widgets Qt5::Network Qt5::Concurrent) diff --git a/Makefile b/Makefile
index 20d79eda..772af477 100644 --- a/Makefile +++ b/Makefile
@@ -42,6 +42,7 @@ docker-app-image: image -v `pwd`:/build nheko-app-image make linux-appimage clean: - rm -rf build + git clean -xdf + git submodule foreach git clean -xdf .PHONY: build app dmg diff --git a/libs/matrix-structs b/libs/matrix-structs -Subproject d03a370ffd1bbdd5623afbe9817d1b929bc76cd +Subproject d7227d213c253f784b3fd470e0ac98165d2de56