Merge pull request #17 from AlwinEsch/Matrix-change

[Matrix] cleanups / API change

Author: AlwinEsch

.gitignore

@@ -1,9 +1,17 @@
 # build artifacts
 build/
-obj-x86_64-linux-gnu/
-lib/vis_milkdrop/*.inc
 visualization.*/addon.xml
 
+# Debian build files
+debian/changelog
+debian/files
+debian/*.log
+debian/*.substvars
+debian/.debhelper/
+debian/tmp/
+debian/kodi-visualization-*/
+obj-x86_64-linux-gnu/
+
 # commonly used editors
 # vim
 *.swp
@@ -27,5 +35,8 @@ visualization.*/addon.xml
 # clion
 .idea/
 
-# KDev
-*.kdev4
+# to prevent add after a "git format-patch VALUE" and "git add ." call
+/*.patch
+
+# to prevent add if project code opened by Visual Studio over CMake file
+.vs/

FindDirectX.cmake

@@ -1,27 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 project(nasmw)
 
-include(ExternalProject)
-
-# Prevent this on UWP ARM build
-if(NOT CMAKE_GENERATOR MATCHES ARM)
-  externalproject_add(nasmw
-                      SOURCE_DIR ${PROJECT_SOURCE_DIR}
-                      BINARY_DIR ${PROJECT_SOURCE_DIR}
-                      INSTALL_DIR ${PROJECT_SOURCE_DIR}
-                      CONFIGURE_COMMAND ""
-                      BUILD_COMMAND nmake /f Mkfiles/msvc.mak
-                      INSTALL_COMMAND "")
-else()
-  externalproject_add(nasmw
-                      SOURCE_DIR ${PROJECT_SOURCE_DIR}
-                      BINARY_DIR ${PROJECT_SOURCE_DIR}
-                      INSTALL_DIR ${PROJECT_SOURCE_DIR}
-                      CONFIGURE_COMMAND ""
-                      BUILD_COMMAND cmake -E echo "NASM not used on UWP ARM"
-                      INSTALL_COMMAND "")
-endif()
-
-install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-                          RENAME nasmw.exe
-                          OPTIONAL)
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+)

depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch

@@ -1 +1 @@
-b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
+250f9b5eeb2111e8c7b494a977490985b8604fe7518a6f5041cde37cc727a067

depends/windowsstore/nasmw/CMakeLists.txt

@@ -1 +1 @@
-nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
+nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02-win32.zip

depends/windowsstore/nasmw/nasmw.sha256

@@ -811,8 +811,6 @@ void CPlugin::MyPreInitialize()
 
 //----------------------------------------------------------------------
 
-extern void LoadSettings();
-
 void CPlugin::MyReadConfig()
 {
 /*
@@ -918,8 +916,6 @@ void CPlugin::MyReadConfig()
 
 	//-------------------------------------------------------------------------
 	// XML version
-
-  LoadSettings();
 }
 
 //----------------------------------------------------------------------