Make Plays dependencies submodule in this repo

jpd002 · Aug 30, 2019 · 3f701fe · 3f701fe
1 parent 7cdc466
commit 3f701fe
Show file tree

Hide file tree

Showing 26 changed files with 62 additions and 46 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "deps/Dependencies"]
+	path = deps/Dependencies
+	url = https://github.com/jpd002/Play-Dependencies.git
+[submodule "deps/Framework"]
+	path = deps/Framework
+	url = https://github.com/jpd002/Play--Framework.git
+[submodule "deps/CodeGen"]
+	path = deps/CodeGen
+	url = https://github.com/jpd002/Play--CodeGen.git
+[submodule "deps/Nuanceur"]
+	path = deps/Nuanceur
+	url = https://github.com/jpd002/Nuanceur.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 project(Play)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)
@@ -37,7 +37,7 @@ endif()
 # targets, packages and dependencies
 if(NOT TARGET Framework)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/build_cmake/Framework
+		${CMAKE_CURRENT_SOURCE_DIR}/../deps/Framework/build_cmake/Framework
 		${CMAKE_CURRENT_BINARY_DIR}/Framework
 	)
 endif()
@@ -46,7 +46,7 @@ list(APPEND PROJECT_LIBS Framework)
 if(ENABLE_AMAZON_S3)
 	if(NOT TARGET Framework_Http)
 		add_subdirectory(
-			${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/build_cmake/FrameworkHttp
+			${CMAKE_CURRENT_SOURCE_DIR}/../deps/Framework/build_cmake/FrameworkHttp
 			${CMAKE_CURRENT_BINARY_DIR}/FrameworkHttp
 		)
 	endif()
@@ -60,15 +60,15 @@ endif()
 
 if(NOT TARGET CodeGen)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../CodeGen/build_cmake
+		${CMAKE_CURRENT_SOURCE_DIR}/../deps/CodeGen/build_cmake
 		${CMAKE_CURRENT_BINARY_DIR}/CodeGen
 	)
 endif()
 list(APPEND PROJECT_LIBS CodeGen)
 
 if(NOT TARGET Boost::boost)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../Dependencies/boost-cmake
+		${CMAKE_CURRENT_SOURCE_DIR}/../deps/Dependencies/boost-cmake
 		${CMAKE_CURRENT_BINARY_DIR}/boost-cmake
 	)
 endif()
@@ -79,7 +79,7 @@ if(NOT BZIP2_FOUND)
 	MESSAGE("-- Using Provided BZip2 source")
 	if(NOT TARGET BZip2::BZip2)
 		add_subdirectory(
-			${CMAKE_CURRENT_SOURCE_DIR}/../../Dependencies/build_cmake/bzip2-1.0.6
+			${CMAKE_CURRENT_SOURCE_DIR}/../deps/Dependencies/build_cmake/bzip2-1.0.6
 			${CMAKE_CURRENT_BINARY_DIR}/bzip2-1.0.6
 		)
 	endif()
@@ -94,7 +94,7 @@ if(NOT ZLIB_FOUND)
 	MESSAGE("-- Using Provided zlib source")
 	if(NOT TARGET zlibstatic)
 		add_subdirectory(
-			${CMAKE_CURRENT_SOURCE_DIR}/../../Dependencies/build_cmake/zlib-1.2.8
+			${CMAKE_CURRENT_SOURCE_DIR}/../deps/Dependencies/build_cmake/zlib-1.2.8
 			${CMAKE_CURRENT_BINARY_DIR}/zlib-1.2.8
 		)
 	endif()
@@ -433,8 +433,8 @@ target_include_directories(PlayCore
 	PUBLIC
 		${CMAKE_CURRENT_SOURCE_DIR}
 	PRIVATE
-		${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/include
-		${CMAKE_CURRENT_SOURCE_DIR}/../../CodeGen/include
+		${CMAKE_CURRENT_SOURCE_DIR}/../deps/Framework/include
+		${CMAKE_CURRENT_SOURCE_DIR}/../deps/CodeGen/include
 )
 target_compile_definitions(PlayCore PUBLIC ${DEFINITIONS_LIST})
 if(NOT ANDROID)

diff --git a/Source/gs/GSH_Direct3D9/CMakeLists.txt b/Source/gs/GSH_Direct3D9/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 
@@ -13,7 +13,7 @@ project(gsh_d3d9)
 if(CMAKE_GENERATOR_TOOLSET MATCHES "_xp$")
 	if(NOT TARGET d3dcompiler)
 		add_subdirectory(
-			${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/d3dcompiler_winxp
+			${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/d3dcompiler_winxp
 			${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_winxp
 		)
 	endif()
@@ -22,15 +22,15 @@ endif()
 
 if(NOT TARGET Framework_Win32)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../../Framework/build_cmake/FrameworkWin32
+		${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Framework/build_cmake/FrameworkWin32
 		${CMAKE_CURRENT_BINARY_DIR}/Framework_Win32
 	)
 endif()
 list(APPEND gsh_d3d9_PROJECT_LIBS Framework_Win32)
 
 if(NOT TARGET Nuanceur)
 add_subdirectory(
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Nuanceur/build_cmake
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Nuanceur/build_cmake
 	${CMAKE_CURRENT_BINARY_DIR}/Nuanceur
 )
 endif()

diff --git a/Source/gs/GSH_OpenGL/CMakeLists.txt b/Source/gs/GSH_OpenGL/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 
@@ -11,7 +11,7 @@ project(GSH_OpenGL)
 
 if(NOT TARGET Framework_OpenGl)
 add_subdirectory(
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Framework/build_cmake/FrameworkOpenGl
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Framework/build_cmake/FrameworkOpenGl
 	${CMAKE_CURRENT_BINARY_DIR}/FrameworkOpenGl
 )
 endif()

diff --git a/Source/gs/GSH_OpenGLWin32/CMakeLists.txt b/Source/gs/GSH_OpenGLWin32/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 
@@ -11,7 +11,7 @@ project(GSH_OpenGLWin32)
 
 if(NOT TARGET Framework_Win32)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../../Framework/build_cmake/FrameworkWin32
+		${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Framework/build_cmake/FrameworkWin32
 		${CMAKE_CURRENT_BINARY_DIR}/Framework_Win32
 	)
 endif()

diff --git a/Source/ui_android/CMakeLists.txt b/Source/ui_android/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/Source/ui_ios/CMakeLists.txt b/Source/ui_ios/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)
@@ -34,15 +34,15 @@ list(APPEND PROJECT_LIBS sh_openal)
 
 if(NOT TARGET iCade_Static)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/build_cmake/iCade-iOS
+		${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/build_cmake/iCade-iOS
 		${CMAKE_CURRENT_BINARY_DIR}/iCade-iOS
 	)
 endif()
 list(APPEND PROJECT_LIBS iCade_Static)
 
 if(NOT TARGET SDWebImage_Static)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/build_cmake/SDWebImage
+		${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/build_cmake/SDWebImage
 		${CMAKE_CURRENT_BINARY_DIR}/SDWebImage
 	)
 endif()

diff --git a/Source/ui_qt/CMakeLists.txt b/Source/ui_qt/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)
@@ -108,7 +108,7 @@ endif()
 if(TARGET_PLATFORM_WIN32)
 	if(NOT TARGET Framework_Win32)
 		add_subdirectory(
-			${CMAKE_CURRENT_SOURCE_DIR}/../../../Framework/build_cmake/FrameworkWin32
+			${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Framework/build_cmake/FrameworkWin32
 			${CMAKE_CURRENT_BINARY_DIR}/Framework_Win32
 		)
 	endif()

diff --git a/Source/ui_qt/win32/DebugSupport/CMakeLists.txt b/Source/ui_qt/win32/DebugSupport/CMakeLists.txt
@@ -2,15 +2,15 @@ cmake_minimum_required(VERSION 3.5)
 project(PlayDebugSupport)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 
 include(Header)
 
 if(NOT TARGET Framework_Win32)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Framework/build_cmake/FrameworkWin32
+		${CMAKE_CURRENT_SOURCE_DIR}/../../../../deps/Framework/build_cmake/FrameworkWin32
 		${CMAKE_CURRENT_BINARY_DIR}/Framework_Win32
 	)
 endif()

diff --git a/Source/ui_shared/CMakeLists.txt b/Source/ui_shared/CMakeLists.txt
@@ -1,23 +1,23 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 
 project(ui_shared)
 
 if(NOT TARGET Framework_Sqlite)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../Framework/build_cmake/FrameworkSqlite
+		${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Framework/build_cmake/FrameworkSqlite
 		${CMAKE_CURRENT_BINARY_DIR}/FrameworkSqlite
 	)
 endif()
 list(APPEND SHARED_UI_PROJECT_LIBS Framework_Sqlite)
 
 if(NOT TARGET Framework_Http)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../Framework/build_cmake/FrameworkHttp
+		${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Framework/build_cmake/FrameworkHttp
 		${CMAKE_CURRENT_BINARY_DIR}/FrameworkHttp
 	)
 endif()
@@ -26,7 +26,7 @@ list(APPEND SHARED_UI_PROJECT_LIBS Framework_Http)
 if(NOT TARGET nlohmann_json)
 	set(JSON_BuildTests OFF CACHE BOOL "Disable test build")
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/build_cmake/nlohmann_json
+		${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/build_cmake/nlohmann_json
 		${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json
 		EXCLUDE_FROM_ALL
 	)

diff --git a/deps/CodeGen b/deps/CodeGen
diff --git a/deps/Dependencies b/deps/Dependencies
diff --git a/deps/Framework b/deps/Framework
diff --git a/deps/Nuanceur b/deps/Nuanceur
diff --git a/tools/AutoTest/CMakeLists.txt b/tools/AutoTest/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/tools/McServTest/CMakeLists.txt b/tools/McServTest/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/tools/PsfPlayer/CMakeLists.txt b/tools/PsfPlayer/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/tools/PsfPlayer/Source/CMakeLists.txt b/tools/PsfPlayer/Source/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)
@@ -25,7 +25,7 @@ list(APPEND PROJECT_LIBS PlayCore)
 if(PSF_RAR_SUPPORT)
 	if(NOT TARGET unrar)
 		add_subdirectory(
-			${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/build_cmake/unrarsrc-5.2.5
+			${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/build_cmake/unrarsrc-5.2.5
 			${CMAKE_CURRENT_BINARY_DIR}/unrarsrc-5.2.5
 		)
 	endif()

diff --git a/tools/PsfPlayer/Source/SH_OpenAL/CMakeLists.txt b/tools/PsfPlayer/Source/SH_OpenAL/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 
@@ -11,15 +11,15 @@ project(SH_OpenAL)
 
 if(NOT TARGET Framework)
 	add_subdirectory(
-		${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Framework/build_cmake/Framework
+		${CMAKE_CURRENT_SOURCE_DIR}/../../../../deps/Framework/build_cmake/Framework
 		${CMAKE_CURRENT_BINARY_DIR}/Framework
 	)
 endif()
 list(APPEND PROJECT_LIBS Framework)
 
 if(NOT TARGET Framework_OpenAl)
 add_subdirectory(
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Framework/build_cmake/FrameworkOpenAl
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../../deps/Framework/build_cmake/FrameworkOpenAl
 	${CMAKE_CURRENT_BINARY_DIR}/FrameworkOpenAl
 )
 endif()

diff --git a/tools/PsfPlayer/Source/ios_ui/CMakeLists.txt b/tools/PsfPlayer/Source/ios_ui/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/tools/PsfPlayer/Source/macosx_ui/CMakeLists.txt b/tools/PsfPlayer/Source/macosx_ui/CMakeLists.txt
@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/tools/PsfPlayer/Source/ui_aot/CMakeLists.txt b/tools/PsfPlayer/Source/ui_aot/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)

diff --git a/tools/PsfPlayer/Source/unix_ui/CMakeLists.txt b/tools/PsfPlayer/Source/unix_ui/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Dependencies/cmake-modules
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../../deps/Dependencies/cmake-modules
 	${CMAKE_MODULE_PATH}
 )
 include(Header)