diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2022-02-24 17:55:57 +0100 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2022-03-30 08:20:21 +0200 |
| commit | 9eee43d3bb24000077602a62dfdfeee2606f1589 (patch) | |
| tree | 0e5f8efef62b068e252fe9c98c14fec723e0a7a3 /res | |
| parent | 18717569acda82b26099c62410df3b398d596ba1 (diff) | |
Add support for keyboard and mouse
Diffstat (limited to 'res')
| -rw-r--r-- | res/CMakeLists.txt | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index b99f2e6..5ecf3c5 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -22,12 +22,19 @@ function(sprite) BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${SPRITE_NAME}) add_dependencies(iso ${SPRITE_NAME}_img) elseif(SDL1_2_BUILD) - add_custom_target(${SPRITE_NAME}_img ALL - cp ${SPRITE_NAME}.bmp ${CMAKE_CURRENT_BINARY_DIR}/${SPRITE_NAME} + if(${SPRITE_TRANSPARENT}) + set(trans "transparent=1") + else() + set(trans "transparent=0") + endif() + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SPRITE_NAME} + COMMAND add-header ${trans} ${SPRITE_NAME}_24.bmp ${CMAKE_CURRENT_BINARY_DIR}/${SPRITE_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${SPRITE_NAME}.bmp - BYPRODUCTS ${SPRITE_NAME}) - add_dependencies(${PROJECT_NAME} ${SPRITE_NAME}_img) + DEPENDS ${SPRITE_NAME}_24.bmp + VERBATIM) + add_custom_target(${SPRITE_NAME}_img + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SPRITE_NAME}) endif() endfunction() @@ -51,16 +58,20 @@ function(sound) BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME}) add_dependencies(iso ${SOUND_NAME}_snd) elseif(SDL1_2_BUILD) - add_custom_target(${SOUND_NAME}_snd ALL - #ffmpeg -y -i ${SOUND_NAME}.wav - # -loglevel error - # -c:a libvorbis - # ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME} - cp ${SOUND_NAME}.wav ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME} + if(${SOUND_LOOP}) + set(loop "loop=1") + else() + set(loop "loop=0") + endif() + + # Reference: https://gist.github.com/socantre/7ee63133a0a3a08f3990 + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME} + COMMAND add-header ${loop} ${SOUND_NAME}.wav ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${SOUND_NAME}.wav - BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME}) - add_dependencies(${PROJECT_NAME} ${SOUND_NAME}_snd) + VERBATIM) + add_custom_target(${SOUND_NAME}_snd + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOUND_NAME}) endif() endfunction() @@ -71,11 +82,15 @@ function(container) cmake_parse_arguments(CONTAINER "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - add_custom_target(${CONTAINER_NAME}_container ALL - container ${CONTAINER_SPRITES} ${CONTAINER_SOUNDS} + add_custom_command(OUTPUT ${cdroot}/${CONTAINER_NAME}.cnt + COMMAND container ${CONTAINER_SPRITES} ${CONTAINER_SOUNDS} ${cdroot}/${CONTAINER_NAME}.cnt WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - BYPRODUCTS ${cdroot}/${CONTAINER_NAME}.cnt) + VERBATIM) + + add_custom_target(${CONTAINER_NAME}_container + DEPENDS ${cdroot}/${CONTAINER_NAME}.cnt) + add_dependencies(${PROJECT_NAME} ${CONTAINER_NAME}_container) foreach(sprite ${CONTAINER_SPRITES}) add_dependencies(${CONTAINER_NAME}_container ${sprite}_img) @@ -168,7 +183,7 @@ sprite(NAME gui_bar_mid BPP 4 CX 368 CY 506 - TRANSPARENT TRUE) + TRANSPARENT FALSE) sprite(NAME gui_bar_right X 376 |