YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build UI in a new generated dir

Browse Source
This commit is contained in:
Dominic Masters
2023-02-04 00:41:39 -08:00
parent a0c0e187d8
commit 41e755d533
3 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -22,6 +22,7 @@ set(DAWN_BUILD_DIR "${CMAKE_BINARY_DIR}")
set(DAWN_TOOLS_DIR "${DAWN_ROOT_DIR}/tools")
set(DAWN_ASSETS_SOURCE_DIR "${DAWN_ROOT_DIR}/assets")
set(DAWN_ASSETS_BUILD_DIR "${DAWN_BUILD_DIR}/assets")
set(DAWN_GENERATED_DIR "${DAWN_BUILD_DIR}/generated")
set(DAWN_TEMP_DIR "${DAWN_BUILD_DIR}/temp")
# Variable Caches

4
src/dawntools/display/CMakeLists.txt
View File

@ -39,12 +39,12 @@ endfunction()
# UI Tool
function(tool_ui target in)
add_custom_target(${target}
COMMAND uigen "${DAWN_ASSETS_SOURCE_DIR}/${in}" "${DAWN_ASSETS_BUILD_DIR}/${target}"
COMMAND uigen "${DAWN_ASSETS_SOURCE_DIR}/${in}" "${DAWN_GENERATED_DIR}/ui/${target}"
COMMENT "Generating ui ${target} from ${in}"
DEPENDS uigen
)
target_include_directories(${DAWN_TARGET_NAME}
PUBLIC
${DAWN_ASSETS_BUILD_DIR}
${DAWN_GENERATED_DIR}/ui
)
endfunction()

17
src/dawntools/display/uigen/main.cpp
View File

@ -187,15 +187,10 @@ int main(int argc, char *args[]) {
return 1;
}
char fileIn[FILENAME_MAX];
char fileOut[FILENAME_MAX];
sprintf(fileIn, "%s", args[1]);
sprintf(fileOut, "%s.hpp", args[2]);
fileNormalizeSlashes(args[1]);
fileNormalizeSlashes(args[2]);
// Open input file.
char fileIn[FILENAME_MAX];
fileNormalizeSlashes(args[1]);
sprintf(fileIn, "%s", args[1]);
FILE *fin = fopen(fileIn, "rb");
if(fin == NULL) {
std::cout << "Failed to open input file " << fileIn << std::endl;
@ -327,9 +322,13 @@ int main(int argc, char *args[]) {
bufferOut += " };\n";
bufferOut += "}";
// Finished with XML data, now we can write data out.
xmlDispose(&xml);
// Finished with XML data, now we can write data out.
char fileOut[FILENAME_MAX];
fileNormalizeSlashes(args[2]);
sprintf(fileOut, "%s.hpp", args[2]);
fileMkdirp(fileOut);
FILE *fout = fopen(fileOut, "wb");
if(fout == NULL) {
std::cout << "Failed to open output file." << std::endl;