From 459b66b955555fea0f6851aa010e43638c5d0da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophyl=20Hoguet?= Date: Sun, 20 Mar 2022 03:16:17 +0100 Subject: [PATCH] rename img -> assets + remove dupli from cmake.txt --- CMakeLists.txt | 17 ++++++----------- arial.ttf => assets/arial.ttf | Bin {img => assets}/lightbulb_red.png | Bin {img => assets}/lightbulb_white.png | Bin {img => assets}/redo_down.png | Bin {img => assets}/redo_up.png | Bin {img => assets}/restart_down.png | Bin {img => assets}/restart_up.png | Bin {img => assets}/solve_down.png | Bin {img => assets}/solve_up.png | Bin {img => assets}/undo_down.png | Bin {img => assets}/undo_up.png | Bin 12 files changed, 6 insertions(+), 11 deletions(-) rename arial.ttf => assets/arial.ttf (100%) rename {img => assets}/lightbulb_red.png (100%) rename {img => assets}/lightbulb_white.png (100%) rename {img => assets}/redo_down.png (100%) rename {img => assets}/redo_up.png (100%) rename {img => assets}/restart_down.png (100%) rename {img => assets}/restart_up.png (100%) rename {img => assets}/solve_down.png (100%) rename {img => assets}/solve_up.png (100%) rename {img => assets}/undo_down.png (100%) rename {img => assets}/undo_up.png (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e124a9..68b5bd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,17 +33,12 @@ set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG") # use CMake option: -DCMAKE_BUILD_TY ######################### COPY IMGAES ######################### -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/lightbulb_red.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/lightbulb_white.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/redo_down.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/redo_up.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/restart_up.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/restart_down.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/undo_down.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/undo_up.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/solve_up.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/img/solve_down.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/arial.ttf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +file(GLOB ASSETS + "${CMAKE_CURRENT_SOURCE_DIR}/assets/*" +) +message(STATUS "Assets found: ${ASSETS}") +file(COPY ${ASSETS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + ############################# SRC ############################# diff --git a/arial.ttf b/assets/arial.ttf similarity index 100% rename from arial.ttf rename to assets/arial.ttf diff --git a/img/lightbulb_red.png b/assets/lightbulb_red.png similarity index 100% rename from img/lightbulb_red.png rename to assets/lightbulb_red.png diff --git a/img/lightbulb_white.png b/assets/lightbulb_white.png similarity index 100% rename from img/lightbulb_white.png rename to assets/lightbulb_white.png diff --git a/img/redo_down.png b/assets/redo_down.png similarity index 100% rename from img/redo_down.png rename to assets/redo_down.png diff --git a/img/redo_up.png b/assets/redo_up.png similarity index 100% rename from img/redo_up.png rename to assets/redo_up.png diff --git a/img/restart_down.png b/assets/restart_down.png similarity index 100% rename from img/restart_down.png rename to assets/restart_down.png diff --git a/img/restart_up.png b/assets/restart_up.png similarity index 100% rename from img/restart_up.png rename to assets/restart_up.png diff --git a/img/solve_down.png b/assets/solve_down.png similarity index 100% rename from img/solve_down.png rename to assets/solve_down.png diff --git a/img/solve_up.png b/assets/solve_up.png similarity index 100% rename from img/solve_up.png rename to assets/solve_up.png diff --git a/img/undo_down.png b/assets/undo_down.png similarity index 100% rename from img/undo_down.png rename to assets/undo_down.png diff --git a/img/undo_up.png b/assets/undo_up.png similarity index 100% rename from img/undo_up.png rename to assets/undo_up.png