From e9d01a36f1dd1a4b8483901cc1330cc5a5a3bcaa Mon Sep 17 00:00:00 2001 From: Jan Niklas Hasse Date: Tue, 17 May 2022 18:58:57 +0200 Subject: [PATCH] Move theoraplay to src/ to get rid of subprojects/ folder --- CMakeLists.txt | 4 ++-- src/jngl/Video.cpp | 4 ++-- {subprojects => src}/theoraplay/LICENSE.txt | 0 {subprojects => src}/theoraplay/theoraplay.cpp | 0 {subprojects => src}/theoraplay/theoraplay.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {subprojects => src}/theoraplay/LICENSE.txt (100%) rename {subprojects => src}/theoraplay/theoraplay.cpp (100%) rename {subprojects => src}/theoraplay/theoraplay.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39aa441db..e9f4da609 100644 --- 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 index 02cd0c78d..648fb0dc4 100644 --- a/src/jngl/Video.cpp +++ b/src/jngl/Video.cpp @@ -1,4 +1,4 @@ -// Copyright 2018-2020 Jan Niklas Hasse +// Copyright 2018-2022 Jan Niklas Hasse // 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 b/src/theoraplay/LICENSE.txt similarity index 100% rename from subprojects/theoraplay/LICENSE.txt rename to src/theoraplay/LICENSE.txt diff --git a/subprojects/theoraplay/theoraplay.cpp b/src/theoraplay/theoraplay.cpp similarity index 100% rename from subprojects/theoraplay/theoraplay.cpp rename to src/theoraplay/theoraplay.cpp diff --git a/subprojects/theoraplay/theoraplay.h b/src/theoraplay/theoraplay.h similarity index 100% rename from subprojects/theoraplay/theoraplay.h rename to src/theoraplay/theoraplay.h