diff --git a/game_launcher/CMakeLists.txt b/game_launcher/CMakeLists.txt index ade72fa90..083ff8e0b 100644 --- a/game_launcher/CMakeLists.txt +++ b/game_launcher/CMakeLists.txt @@ -51,9 +51,9 @@ if(MSVC) endif() if(MSVC) - target_link_libraries(${PROJECT_NAME} PRIVATE "user32" "shell32") + target_link_libraries(${PROJECT_NAME} PRIVATE user32 shell32) else() - target_link_libraries(${PROJECT_NAME} PRIVATE "dl") + target_link_libraries(${PROJECT_NAME} PRIVATE dl) endif() # set static compiler runtime @@ -63,28 +63,22 @@ endif() # set build output directory set(DIR_LAUNCHER_OUTPUT - ${CMAKE_BINARY_DIR}/$/ + ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/ ) -if(MSVC) - set_target_properties(game_launcher PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${DIR_LAUNCHER_OUTPUT} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${DIR_LAUNCHER_OUTPUT} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${DIR_LAUNCHER_OUTPUT} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${DIR_LAUNCHER_OUTPUT} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${DIR_LAUNCHER_OUTPUT} - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${DIR_LAUNCHER_OUTPUT} - ) +set_target_properties(game_launcher PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY ${DIR_LAUNCHER_OUTPUT} + LIBRARY_OUTPUT_DIRECTORY ${DIR_LAUNCHER_OUTPUT} + RUNTIME_OUTPUT_DIRECTORY ${DIR_LAUNCHER_OUTPUT} +) + +if(WIN32) set(LAUNCHER_OUTPUT_NAME "${GAMEDIR}") else() - set_target_properties(game_launcher PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY ${DIR_LAUNCHER_OUTPUT} - LIBRARY_OUTPUT_DIRECTORY ${DIR_LAUNCHER_OUTPUT} - RUNTIME_OUTPUT_DIRECTORY ${DIR_LAUNCHER_OUTPUT} - ) set(LAUNCHER_OUTPUT_NAME "${GAMEDIR}_run") endif() +# disable arch postfix for launcher executable set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${LAUNCHER_OUTPUT_NAME}" PREFIX "")