mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
fix missing icon in executable
the Ja2.rc file needs to be in the add_executable target for the icon to appear, and that one requires WinMain. so get rid of dummy.cpp and put sgp/sgp.cpp in there
This commit is contained in:
committed by
majcosta
parent
a7b0091a27
commit
b908bcecb9
@@ -1,5 +1,3 @@
|
|||||||
dummy.cpp
|
|
||||||
|
|
||||||
# CLion
|
# CLion
|
||||||
/.idea/
|
/.idea/
|
||||||
/cmake-build-*/
|
/cmake-build-*/
|
||||||
|
|||||||
+4
-2
@@ -139,8 +139,10 @@ foreach(app IN LISTS ApplicationTargets)
|
|||||||
foreach(lang IN LISTS LangTargets)
|
foreach(lang IN LISTS LangTargets)
|
||||||
# executable for an application/language combination, e.g. JA2_ENGLISH.exe
|
# executable for an application/language combination, e.g. JA2_ENGLISH.exe
|
||||||
set(exe ${app}_${lang})
|
set(exe ${app}_${lang})
|
||||||
file(WRITE dummy.cpp "")
|
add_executable(${exe} WIN32
|
||||||
add_executable(${exe} WIN32 dummy.cpp)
|
sgp/sgp.cpp
|
||||||
|
Ja2/Res/Ja2.rc
|
||||||
|
)
|
||||||
target_link_libraries(${exe} PRIVATE ${Ja2_Libraries} $<IF:${usingMsBuild},legacy_stdio_definitions.lib,>)
|
target_link_libraries(${exe} PRIVATE ${Ja2_Libraries} $<IF:${usingMsBuild},legacy_stdio_definitions.lib,>)
|
||||||
target_link_options(${exe} PRIVATE $<IF:${usingMsBuild},/SAFESEH:NO,>)
|
target_link_options(${exe} PRIVATE $<IF:${usingMsBuild},/SAFESEH:NO,>)
|
||||||
|
|
||||||
|
|||||||
@@ -34,5 +34,4 @@ set(Ja2Src
|
|||||||
"${CMAKE_CURRENT_SOURCE_DIR}/XML_DifficultySettings.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/XML_DifficultySettings.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/XML_IntroFiles.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/XML_IntroFiles.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/XML_Layout_MainMenu.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/XML_Layout_MainMenu.cpp"
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/Res/ja2.rc
|
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ set(sgpSrc
|
|||||||
"${CMAKE_CURRENT_SOURCE_DIR}/PCX.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/PCX.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/PngLoader.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/PngLoader.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Random.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/Random.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/sgp.cpp"
|
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/sgp_logger.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/sgp_logger.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/shading.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/shading.cpp"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/soundman.cpp"
|
"${CMAKE_CURRENT_SOURCE_DIR}/soundman.cpp"
|
||||||
|
|||||||
Reference in New Issue
Block a user