emulator: Refactor file structure (#557)

Also:
- external: update some submodules.

.gitignore

@@ -3,7 +3,7 @@
 /build-windows/
 /api.trace
 .vs/
-/src/external/boost-build
+/external/boost-build
 .idea/
 .vs
 .vscode

.gitmodules

@@ -1,74 +1,74 @@
-[submodule "src/external/elfio"]
-	path = src/external/elfio
-	url = https://github.com/serge1/ELFIO.git
-[submodule "src/external/capstone"]
-	path = src/external/capstone
+[submodule "external/better-enums"]
+	path = external/better-enums
+	url = https://github.com/aantron/better-enums
+[submodule "external/boost"]
+	path = external/boost
+	url = https://github.com/Vita3K/ext-boost
+[submodule "external/capstone"]
+	path = external/capstone
 	url = https://github.com/aquynh/capstone.git
-[submodule "src/external/vita-headers"]
-	path = src/external/vita-headers
-	url = https://github.com/vitasdk/vita-headers.git
-[submodule "src/external/yaml-cpp"]
-	path = src/external/yaml-cpp
-	url = https://github.com/jbeder/yaml-cpp
-[submodule "src/external/microprofile"]
-	path = src/external/microprofile
-	url = https://github.com/jonasmr/microprofile.git
-[submodule "src/external/sdl2-cmake-scripts"]
-	path = src/external/sdl2-cmake-scripts
-	url = https://github.com/tcbrindle/sdl2-cmake-scripts.git
-[submodule "src/external/spdlog"]
-	path = src/external/spdlog
-	url = https://github.com/gabime/spdlog.git
-	branch = v1.x
-[submodule "src/external/stb"]
-	path = src/external/stb
-	url = https://github.com/nothings/stb
-[submodule "src/external/dirent"]
-	path = src/external/dirent
+[submodule "external/crypto-algorithms"]
+	path = external/crypto-algorithms
+	url = https://github.com/B-Con/crypto-algorithms
+[submodule "external/dirent"]
+	path = external/dirent
 	url = https://github.com/tronkko/dirent
 	branch = v1.23
-[submodule "src/external/crypto-algorithms"]
-	path = src/external/crypto-algorithms
-	url = https://github.com/B-Con/crypto-algorithms.git
-[submodule "src/external/imgui"]
-	path = src/external/imgui
-	url = https://github.com/ocornut/imgui
-[submodule "src/external/googletest"]
-	path = src/external/googletest
-	url = https://github.com/google/googletest.git
-[submodule "src/emulator/shaders-db"]
-	path = src/emulator/shaders-db
-	url = https://github.com/Vita3K/shaders-db.git
-[submodule "src/external/glslang"]
-	path = src/external/glslang
-	url = https://github.com/KhronosGroup/glslang.git
-[submodule "src/external/boost"]
-	path = src/external/boost
-	url = https://github.com/Vita3K/ext-boost.git
-[submodule "src/external/dlmalloc"]
-	path = src/external/dlmalloc
-	url = https://github.com/Vita3K/dlmalloc
-[submodule "src/external/printf"]
-	path = src/external/printf
-	url = https://github.com/vita3k/printf
-[submodule "src/external/imgui_club"]
-	path = src/external/imgui_club
-	url = https://github.com/ocornut/imgui_club.git
-[submodule "src/external/unicorn-src"]
-	path = src/external/unicorn-src
-	url = https://github.com/unicorn-engine/unicorn.git
-[submodule "src/external/discord-rpc"]
-	path = src/external/discord-rpc
+[submodule "external/discord-rpc"]
+	path = external/discord-rpc
 	url = https://github.com/discordapp/discord-rpc
-[submodule "src/external/SPIRV-Cross"]
-	path = src/external/SPIRV-Cross
-	url = https://github.com/vita3k/SPIRV-Cross
-[submodule "src/external/pugixml"]
-	path = src/external/pugixml
+[submodule "external/dlmalloc"]
+	path = external/dlmalloc
+	url = https://github.com/Vita3K/dlmalloc
+[submodule "external/elfio"]
+	path = external/elfio
+	url = https://github.com/serge1/ELFIO
+[submodule "external/glslang"]
+	path = external/glslang
+	url = https://github.com/KhronosGroup/glslang
+[submodule "external/googletest"]
+	path = external/googletest
+	url = https://github.com/google/googletest
+[submodule "external/imgui"]
+	path = external/imgui
+	url = https://github.com/ocornut/imgui
+[submodule "external/imgui_club"]
+	path = external/imgui_club
+	url = https://github.com/ocornut/imgui_club
+[submodule "external/microprofile"]
+	path = external/microprofile
+	url = https://github.com/jonasmr/microprofile
+[submodule "external/printf"]
+	path = external/printf
+	url = https://github.com/Vita3K/printf
+[submodule "external/pugixml"]
+	path = external/pugixml
 	url = https://github.com/zeux/pugixml
-[submodule "src/external/vita-toolchain"]
-	path = src/external/vita-toolchain
-	url = https://github.com/vita3k/vita-toolchain
-[submodule "src/external/better-enums"]
-	path = src/external/better-enums
-	url = https://github.com/aantron/better-enums.git
+[submodule "external/sdl2-cmake-scripts"]
+	path = external/sdl2-cmake-scripts
+	url = https://github.com/tcbrindle/sdl2-cmake-scripts
+[submodule "external/spdlog"]
+	path = external/spdlog
+	url = https://github.com/gabime/spdlog
+	branch = v1.x
+[submodule "external/SPIRV-Cross"]
+	path = external/SPIRV-Cross
+	url = https://github.com/Vita3K/SPIRV-Cross
+[submodule "vita3k/shaders-db"]
+	path = vita3k/shaders-db
+	url = https://github.com/Vita3K/shaders-db
+[submodule "external/stb"]
+	path = external/stb
+	url = https://github.com/nothings/stb
+[submodule "external/unicorn-src"]
+	path = external/unicorn-src
+	url = https://github.com/unicorn-engine/unicorn
+[submodule "external/vita-headers"]
+	path = external/vita-headers
+	url = https://github.com/vitasdk/vita-headers
+[submodule "external/vita-toolchain"]
+	path = external/vita-toolchain
+	url = https://github.com/Vita3K/vita-toolchain
+[submodule "external/yaml-cpp"]
+	path = external/yaml-cpp
+	url = https://github.com/jbeder/yaml-cpp

CMakeLists.txt

@@ -24,9 +24,9 @@ macro(pre_configure_boost)
 		set(BOOST_LIBRARYDIR ${Boost_LIBRARIES})
 	else()
 		message("Setting up ext-boost environment variables")
-		set(BOOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/src/external/boost")
+		set(BOOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/external/boost")
 		set(BOOST_INCLUDEDIR "${BOOST_ROOT}/boost")
-		set(BOOST_LIBRARYDIR "${CMAKE_CURRENT_SOURCE_DIR}/src/external/boost-build/lib")
+		set(BOOST_LIBRARYDIR "${CMAKE_CURRENT_SOURCE_DIR}/external/boost-build/lib")
 	endif()
 
 	message("Using Boost_VERSION: ${BOOST_ROOT}")
@@ -43,6 +43,6 @@ if(WIN32)
 	add_definitions (/D "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS" /D "_CRT_SECURE_NO_WARNINGS")
 endif()
 
-add_subdirectory(src/external)
-add_subdirectory(src/emulator)
-add_subdirectory(src/gen-modules)
+add_subdirectory(external)
+add_subdirectory(vita3k)
+add_subdirectory(tools/gen-modules)

external/elfio

@@ -0,0 +1 @@
+Subproject commit 580da2467b3d7da4c817d45a99a367e4b0d6d326

external/glslang

@@ -0,0 +1 @@
+Subproject commit c11e3156af2297f89a23c8db3f5e2323733ee556

external/imgui

@@ -0,0 +1 @@
+Subproject commit ecb9b1e2eba5becc38019b5c9f75fba711cd881b

external/microprofile

@@ -0,0 +1 @@
+Subproject commit 03c34f96840defe0f4c196309628815d02b98059

external/pugixml

@@ -0,0 +1 @@
+Subproject commit c5752917c72da7cee2271394a827d022ccd4b367