Revert submodule to jack2 repo

LMMS · Oct 20, 2020 · f55f42d · f55f42d
1 parent b1ab5ae
commit f55f42d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -40,6 +40,6 @@
 [submodule "plugins/carlabase/carla"]
 	path = plugins/carlabase/carla
 	url = https://github.com/falktx/carla
-[submodule "src/3rdparty/jackaudio/jack"]
-	path = src/3rdparty/jackaudio/jack
-	url = https://github.com/jackaudio/headers
+[submodule "src/3rdparty/jack2"]
+	path = src/3rdparty/jack2
+	url = https://github.com/jackaudio/jack2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -434,7 +434,7 @@ IF(WANT_JACK)
 	IF(WANT_WEAKJACK)
 		SET(LMMS_HAVE_WEAKJACK TRUE)
 		SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack)
-		SET(JACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/jackaudio)
+		SET(JACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/jack2/common)
 		SET(STATUS_JACK "OK (weak linking enabled)")
 		# use dlsym instead
 		SET(JACK_LIBRARIES ${CMAKE_DL_LIBS})

diff --git a/src/3rdparty/jack2 b/src/3rdparty/jack2
diff --git a/src/3rdparty/jackaudio/jack b/src/3rdparty/jackaudio/jack