1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

better name for the executable target

Browse Source
This commit is contained in:
Marco Antonio Jaguaribe Costa
2023-01-27 20:51:25 -03:00
committed by majcosta
parent 7bbe68e6dd
commit dc5eaf7b67
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -8
View File
@@ -132,20 +132,20 @@ set(debugFlags $<IF:$<CONFIG:Debug>,JA2BETAVERSION;JA2TESTVERSION;DEBUG_ATTACKBU
# TODO: refactor preprocessor usage onto, ideally, a single translation unit # TODO: refactor preprocessor usage onto, ideally, a single translation unit
foreach(lang IN LISTS LangTargets) foreach(lang IN LISTS LangTargets)
foreach(exe IN LISTS ApplicationTargets) foreach(exe IN LISTS ApplicationTargets)
set(targPrefix ${exe}_${lang}) set(Executable ${exe}_${lang})
# executable for an application/language combination, e.g. JA2_ENGLISH.exe # executable for an application/language combination, e.g. JA2_ENGLISH.exe
add_executable(${targPrefix} WIN32) add_executable(${Executable} WIN32)
target_sources(${targPrefix} PRIVATE ${Ja2Src}) target_sources(${Executable} PRIVATE ${Ja2Src})
# Good libraries have already been built, can be simply linked here # Good libraries have already been built, can be simply linked here
target_link_libraries(${targPrefix} PRIVATE ${Ja2_Libraries}) target_link_libraries(${Executable} PRIVATE ${Ja2_Libraries})
# for each app/lang combination, the Very Bad libraries need to be built, # for each app/lang combination, the Very Bad libraries need to be built,
# with the appropriate preprocessor definitions # with the appropriate preprocessor definitions
foreach(lib IN LISTS Ja2_Libs) foreach(lib IN LISTS Ja2_Libs)
# syntactic sugar to hopefully make this more readable # syntactic sugar to hopefully make this more readable
set(tgt ${targPrefix}_${lib}) set(tgt ${Executable}_${lib})
set(isEditor $<STREQUAL:${exe},JA2MAPEDITOR>) set(isEditor $<STREQUAL:${exe},JA2MAPEDITOR>)
set(isUb $<STREQUAL:${exe},JA2UB>) set(isUb $<STREQUAL:${exe},JA2UB>)
set(isUbEditor $<STREQUAL:${exe},JA2UBMAPEDITOR>) set(isUbEditor $<STREQUAL:${exe},JA2UBMAPEDITOR>)
@@ -161,11 +161,11 @@ foreach(lang IN LISTS LangTargets)
${debugFlags} ${debugFlags}
${lang} ${lang}
) )
target_link_libraries(${targPrefix} PUBLIC ${tgt}) target_link_libraries(${Executable} PUBLIC ${tgt})
endforeach() endforeach()
# only SGP depends on these # only SGP depends on these
target_link_libraries(${targPrefix}_SGP PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib") target_link_libraries(${Executable}_SGP PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
target_link_libraries(${targPrefix}_SGP PUBLIC libpng) target_link_libraries(${Executable}_SGP PUBLIC libpng)
endforeach() endforeach()
endforeach() endforeach()