Move theoraplay to src/ to get rid of subprojects/ folder

jhasse · May 17, 2022 · e9d01a3 · e9d01a3
1 parent 434fcf5
commit e9d01a3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -313,7 +313,7 @@ else()
 					pkg_check_modules(VORBIS vorbis)
 					if(VORBIS_FOUND)
 						target_compile_definitions(jngl PRIVATE JNGL_VIDEO)
-						target_sources(jngl PRIVATE subprojects/theoraplay/theoraplay.cpp)
+						target_sources(jngl PRIVATE src/theoraplay/theoraplay.cpp)
 						target_include_directories(jngl PRIVATE ${THEORA_DEC_INCLUDE_DIRS})
 						target_link_libraries(jngl PRIVATE ${VORBIS_LINK_LIBRARIES} ${THEORA_DEC_LINK_LIBRARIES})
 
@@ -441,7 +441,7 @@ if(ANDROID OR IOS OR APPLE OR WINDOWS_STORE)
 		target_link_libraries(jngl PRIVATE theoradec)
 		target_compile_definitions(jngl PRIVATE JNGL_VIDEO)
 		target_include_directories(jngl PRIVATE "${theora_SOURCE_DIR}/include")
-		target_sources(jngl PRIVATE subprojects/theoraplay/theoraplay.cpp)
+		target_sources(jngl PRIVATE src/theoraplay/theoraplay.cpp)
 	endif()
 endif()
 

diff --git a/src/jngl/Video.cpp b/src/jngl/Video.cpp
@@ -1,4 +1,4 @@
-// Copyright 2018-2020 Jan Niklas Hasse <[email protected]>
+// Copyright 2018-2022 Jan Niklas Hasse <[email protected]>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 
 #include "Video.hpp"
@@ -7,7 +7,7 @@
 
 #ifdef JNGL_VIDEO
 
-#include "../../subprojects/theoraplay/theoraplay.h"
+#include "../theoraplay/theoraplay.h"
 #include "../Sound.hpp"
 #include "../audio.hpp"
 #include "../main.hpp"

diff --git a/subprojects/theoraplay/LICENSE.txt → src/theoraplay/LICENSE.txt b/subprojects/theoraplay/LICENSE.txt → src/theoraplay/LICENSE.txt
diff --git a/subprojects/theoraplay/theoraplay.cpp → src/theoraplay/theoraplay.cpp b/subprojects/theoraplay/theoraplay.cpp → src/theoraplay/theoraplay.cpp
diff --git a/subprojects/theoraplay/theoraplay.h → src/theoraplay/theoraplay.h b/subprojects/theoraplay/theoraplay.h → src/theoraplay/theoraplay.h