Move first party tools to tools folder.

This commit is contained in:
Skyth 2024-12-13 21:21:58 +03:00
parent 611454126e
commit 578d9d052b
16 changed files with 14 additions and 14 deletions

4
.gitmodules vendored
View file

@ -1,11 +1,11 @@
[submodule "thirdparty/PowerRecomp"]
path = thirdparty/PowerRecomp
path = tools/PowerRecomp
url = https://github.com/hedge-dev/PowerRecomp
[submodule "thirdparty/ddspp"]
path = thirdparty/ddspp
url = https://github.com/redorav/ddspp.git
[submodule "thirdparty/ShaderRecomp"]
path = thirdparty/ShaderRecomp
path = tools/ShaderRecomp
url = https://github.com/hedge-dev/ShaderRecomp.git
[submodule "thirdparty/libmspack"]
path = thirdparty/libmspack

View file

@ -163,7 +163,7 @@ set(LIBMSPACK_C_SOURCES
set_source_files_properties(${LIBMSPACK_C_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
set(SMOLV_SOURCE_DIR "${SWA_THIRDPARTY_ROOT}/ShaderRecomp/thirdparty/smol-v/source")
set(SMOLV_SOURCE_DIR "${SWA_TOOLS_ROOT}/ShaderRecomp/thirdparty/smol-v/source")
set(BC_DIFF_SOURCE_DIR "${SWA_TOOLS_ROOT}/bc_diff")
set(MINIAUDIO_INCLUDE_DIRS "${SWA_THIRDPARTY_ROOT}/miniaudio")

View file

@ -1,4 +1,4 @@
#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
#ifdef __spirv__

View file

@ -1,4 +1,4 @@
#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
#ifdef __spirv__

View file

@ -1,4 +1,4 @@
#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
#ifdef __spirv__

View file

@ -1,4 +1,4 @@
#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
#ifdef __spirv__

View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
#ifdef __spirv__

View file

@ -34,7 +34,7 @@
#include <magic_enum.hpp>
#endif
#include "../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
#include "../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
#include "shader/copy_vs.hlsl.dxil.h"
#include "shader/copy_vs.hlsl.spirv.h"
#include "shader/csd_filter_ps.hlsl.dxil.h"

View file

@ -25,7 +25,7 @@ add_custom_command(
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/private/default.xex" "${CMAKE_CURRENT_SOURCE_DIR}/config/SWA.toml"
)
set(SHADER_RECOMP_ROOT "${SWA_THIRDPARTY_ROOT}/ShaderRecomp/ShaderRecomp")
set(SHADER_RECOMP_ROOT "${SWA_TOOLS_ROOT}/ShaderRecomp/ShaderRecomp")
set(SHADER_RECOMP_INCLUDE "${SHADER_RECOMP_ROOT}/shader_common.h")
target_compile_definitions(ShaderRecomp PRIVATE

View file

@ -3,8 +3,5 @@ set(MSDF_ATLAS_USE_SKIA OFF)
set(MSDF_ATLAS_NO_ARTERY_FONT ON)
set(MSDFGEN_DISABLE_PNG ON)
add_subdirectory(${SWA_THIRDPARTY_ROOT}/PowerRecomp)
add_subdirectory(${SWA_THIRDPARTY_ROOT}/ShaderRecomp)
add_subdirectory(${SWA_THIRDPARTY_ROOT}/o1heap)
add_subdirectory(${SWA_THIRDPARTY_ROOT}/fshasher)
add_subdirectory(${SWA_THIRDPARTY_ROOT}/msdf-atlas-gen)

View file

@ -1,2 +1,5 @@
add_subdirectory(${SWA_TOOLS_ROOT}/file_to_c)
add_subdirectory(${SWA_TOOLS_ROOT}/bc_diff)
add_subdirectory(${SWA_TOOLS_ROOT}/file_to_c)
add_subdirectory(${SWA_TOOLS_ROOT}/fshasher)
add_subdirectory(${SWA_TOOLS_ROOT}/PowerRecomp)
add_subdirectory(${SWA_TOOLS_ROOT}/ShaderRecomp)