thirdpartymirrors/XenonRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/XenonRecomp.git synced 2025-10-30 07:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update bin2h to allow changing the output array type

Browse source
This commit is contained in:
Hyper 2024-10-17 16:59:45 +01:00
parent 6e49be2702
commit 6810be7315
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PowerRecomp/CMakeLists.txt
View file

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.8)
project("PowerRecomp") project("PowerRecomp")
BIN2H(SOURCE_FILE ${POWERUTILS_ROOT}/ppc_context.h HEADER_FILE "generated/ppc_context.gen.h" VARIABLE_NAME "gPPCContextText") BIN2H(SOURCE_FILE ${POWERUTILS_ROOT}/ppc_context.h HEADER_FILE "generated/ppc_context.gen.h" ARRAY_TYPE "char" VARIABLE_NAME "g_PPCContextText")
add_executable(PowerRecomp "main.cpp" "pch.h" "recompiler.cpp" "recompiler.h" "test_recompiler.cpp" "test_recompiler.h" "recompiler_config.h" "recompiler_config.cpp") add_executable(PowerRecomp "main.cpp" "pch.h" "recompiler.cpp" "recompiler.h" "test_recompiler.cpp" "test_recompiler.h" "recompiler_config.h" "recompiler_config.cpp")
target_precompile_headers(PowerRecomp PUBLIC "pch.h") target_precompile_headers(PowerRecomp PUBLIC "pch.h")

2
PowerRecomp/recompiler.cpp
View file

@ -2393,7 +2393,7 @@ void Recompiler::Recompile()
println("#pragma once"); println("#pragma once");
println("#include \"ppc_config.h\"\n"); println("#include \"ppc_config.h\"\n");
println("{}", std::string_view{gPPCContextText, gPPCContextText_SIZE}); println("{}", std::string_view{g_PPCContextText, g_PPCContextText_size});
SaveCurrentOutData("ppc_context.h"); SaveCurrentOutData("ppc_context.h");
} }

11
cmake/bin2h.cmake
View file

@ -37,16 +37,17 @@ endfunction()
# VARIABLE_NAME - The name of the variable for the byte array. The string "_SIZE" will be append # VARIABLE_NAME - The name of the variable for the byte array. The string "_SIZE" will be append
# to this name and will be used a variable name for size variable. # to this name and will be used a variable name for size variable.
# HEADER_FILE - The path of header file. # HEADER_FILE - The path of header file.
# ARRAY_TYPE - The type of each element of the array in the header file.
# APPEND - If specified appends to the header file instead of overwriting it # APPEND - If specified appends to the header file instead of overwriting it
# NULL_TERMINATE - If specified a null byte(zero) will be append to the byte array. This will be # NULL_TERMINATE - If specified a null byte(zero) will be append to the byte array. This will be
# useful if the source file is a text file and we want to use the file contents # useful if the source file is a text file and we want to use the file contents
# as string. But the size variable holds size of the byte array without this # as string. But the size variable holds size of the byte array without this
# null byte. # null byte.
# Usage: # Usage:
# bin2h(SOURCE_FILE "Logo.png" HEADER_FILE "Logo.h" VARIABLE_NAME "LOGO_PNG") # bin2h(SOURCE_FILE "Logo.png" HEADER_FILE "Logo.h" ARRAY_TYPE "char" VARIABLE_NAME "LOGO_PNG")
function(BIN2H) function(BIN2H)
set(options APPEND NULL_TERMINATE) set(options APPEND NULL_TERMINATE)
set(oneValueArgs SOURCE_FILE VARIABLE_NAME HEADER_FILE) set(oneValueArgs SOURCE_FILE VARIABLE_NAME HEADER_FILE ARRAY_TYPE)
cmake_parse_arguments(BIN2H "${options}" "${oneValueArgs}" "" ${ARGN}) cmake_parse_arguments(BIN2H "${options}" "${oneValueArgs}" "" ${ARGN})
# reads source file contents as hex string # reads source file contents as hex string
@ -71,8 +72,8 @@ function(BIN2H)
string(MAKE_C_IDENTIFIER "${BIN2H_VARIABLE_NAME}" BIN2H_VARIABLE_NAME) string(MAKE_C_IDENTIFIER "${BIN2H_VARIABLE_NAME}" BIN2H_VARIABLE_NAME)
# declares byte array and the length variables # declares byte array and the length variables
set(arrayDefinition "const char ${BIN2H_VARIABLE_NAME}[] = { ${arrayValues} };") set(arrayDefinition "const ${BIN2H_ARRAY_TYPE} ${BIN2H_VARIABLE_NAME}[] = { ${arrayValues} };")
set(arraySizeDefinition "const size_t ${BIN2H_VARIABLE_NAME}_SIZE = ${arraySize};") set(arraySizeDefinition "const size_t ${BIN2H_VARIABLE_NAME}_size = ${arraySize};")
set(declarations "${arrayDefinition}\n\n${arraySizeDefinition}\n\n") set(declarations "${arrayDefinition}\n\n${arraySizeDefinition}\n\n")
if(BIN2H_APPEND) if(BIN2H_APPEND)
@ -80,4 +81,4 @@ function(BIN2H)
else() else()
file(WRITE ${BIN2H_HEADER_FILE} "${declarations}") file(WRITE ${BIN2H_HEADER_FILE} "${declarations}")
endif() endif()
endfunction() endfunction()