From 51624cfc2142aa4490e19a5b9bc5e4ae59f44ecd Mon Sep 17 00:00:00 2001 From: Tituya Date: Tue, 23 Mar 2021 00:04:01 +0100 Subject: [PATCH] fix the fix about CMakeLists.txt --- CMakeLists.txt | 43 +++++++++++++++++--------- editor/levels/5.lvl | 2 +- generate_define.sh => update_levels.sh | 1 + 3 files changed, 30 insertions(+), 16 deletions(-) rename generate_define.sh => update_levels.sh (83%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c3896e..1df4775 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,23 +12,36 @@ find_package(Gint 2.1 REQUIRED) include_directories(include) add_custom_command( - OUTPUT "${CMAKE_CURRENT_LIST_DIR}/src/setlevel.c" - COMMENT "Generate src/setlevel.c" - COMMAND python3 compile_levels.py - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - DEPENDS compile_levels.py - ) - -add_custom_command( - OUTPUT - "${CMAKE_CURRENT_LIST_DIR}/src/times.c" - "${CMAKE_CURRENT_LIST_DIR}/include/define.h" - COMMENT "Generate src/times.c & include/define.h" - COMMAND sh generate_define.sh + OUTPUT "${CMAKE_CURRENT_LIST_DIR}/src/times.c" + COMMENT "Generate src/times.c" COMMAND python3 time.py WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - DEPENDS time.py times.lvl generate_define.sh - ) + DEPENDS time.py times.lvl include/define.h) + +add_custom_command(OUTPUT + "${CMAKE_CURRENT_LIST_DIR}/src/setlevel.c" + "${CMAKE_CURRENT_LIST_DIR}/include/define.h" + COMMENT "Generate src/setlevel.c & include/define.h" + COMMAND sh update_levels.sh + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + DEPENDS update_levels.sh compile_levels.py + editor/levels/0.lvl + editor/levels/1.lvl + editor/levels/2.lvl + editor/levels/3.lvl + editor/levels/4.lvl + editor/levels/5.lvl + editor/levels/6.lvl + editor/levels/7.lvl + editor/levels/8.lvl + editor/levels/9.lvl + editor/levels/10.lvl + editor/levels/11.lvl + editor/levels/12.lvl + editor/levels/13.lvl + editor/levels/14.lvl + editor/levels/15.lvl + editor/levels/16.lvl) set(SOURCES src/collide.c diff --git a/editor/levels/5.lvl b/editor/levels/5.lvl index a248016..6190164 100755 --- a/editor/levels/5.lvl +++ b/editor/levels/5.lvl @@ -1,4 +1,4 @@ -000000000000000000000000000000000000000000000000t000000000000000000000000000011dd111111111111111110000100000100000010000001000011cc001s0000d00000001000010000e111dd0100000dd100001001111000d0000000dd100001000001000111d000ddd1000010000000000000000ddd1000011111111111d111B11111000000000000000000000000000000000000000000000000000000000000000000000000000006 +000000000000000000000000000000000000000000000000t000000000000000000000000000011dd111111111111111110000100000100000010000001000011cc001s0000d00000001000010000e111dd0100000dd100001001111000d0000000dd100001000001000111d000ddd1000010000000000000000ddd1000011111111111d111B111110000000000000000000000000000000000000000000000000000kkkkkkkkkkkkkkk00000000006 12 6 \ No newline at end of file diff --git a/generate_define.sh b/update_levels.sh similarity index 83% rename from generate_define.sh rename to update_levels.sh index 3aaa4fb..a4f6fa0 100755 --- a/generate_define.sh +++ b/update_levels.sh @@ -2,3 +2,4 @@ echo "#define LEVEL_MAX $(ls editor/levels/[^0]*.lvl | wc -l) #define PLAYER_HEIGHT 11 #define FPS 70" > include/define.h +python3 compile_levels.py