Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3fb3c1e

Browse files
committedSep 16, 2024
Refactor command-line tools to use shared header
1 parent 1deadd3 commit 3fb3c1e

40 files changed

+956
-1473
lines changed
 

‎CMakeLists.txt

+10-3
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,10 @@ if(BUILD_TOOLS AND WIN32)
404404
add_executable(texassemble
405405
Texassemble/texassemble.cpp
406406
Texassemble/texassemble.rc
407-
Texassemble/settings.manifest
407+
Common/CmdLineHelpers.h
408+
Common/settings.manifest
408409
Texassemble/AnimatedGif.cpp)
410+
target_include_directories(texassemble PRIVATE Common)
409411
target_compile_features(texassemble PRIVATE cxx_std_17)
410412
target_link_libraries(texassemble PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
411413
source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
@@ -416,9 +418,11 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
416418
add_executable(texconv
417419
Texconv/texconv.cpp
418420
Texconv/texconv.rc
419-
Texconv/settings.manifest
421+
Common/CmdLineHelpers.h
422+
Common/settings.manifest
420423
Texconv/ExtendedBMP.cpp
421424
Texconv/PortablePixMap.cpp)
425+
target_include_directories(texconv PRIVATE Common)
422426
target_compile_features(texconv PRIVATE cxx_std_17)
423427
target_link_libraries(texconv PRIVATE ${PROJECT_NAME} ole32.lib shell32.lib version.lib)
424428
source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
@@ -429,7 +433,9 @@ if(BUILD_TOOLS AND WIN32)
429433
add_executable(texdiag
430434
Texdiag/texdiag.cpp
431435
Texdiag/texdiag.rc
432-
Texdiag/settings.manifest)
436+
Common/CmdLineHelpers.h
437+
Common/settings.manifest)
438+
target_include_directories(texdiag PRIVATE Common)
433439
target_compile_features(texdiag PRIVATE cxx_std_17)
434440
target_link_libraries(texdiag PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
435441
source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
@@ -497,6 +503,7 @@ if(BUILD_SAMPLE AND BUILD_DX11 AND WIN32)
497503
target_include_directories(ddsview PRIVATE ${COMPILED_DDSVIEW_SHADERS})
498504

499505
if(NOT USE_PREBUILT_SHADERS)
506+
#TODO: DIRECTX_FXC_TOOL
500507
add_custom_command(
501508
OUTPUT "${COMPILED_DDSVIEW_SHADERS}/ddsview_ps1D.inc"
502509
MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/DDSView/hlsl.cmd"

0 commit comments

Comments
 (0)