🏗️ Rename bonus to graphic

Author: Axistorm1

CMakeLists.txt

@@ -1,40 +1,61 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-project(corewar)
+project(corewar C)
 
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_C_STANDARD 23)
+set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 file(GLOB SOURCES
     src/*.c
     src/arena/*.c
     src/arena/instructions/*.c
+    src/graphic/*.c
+    src/graphic/menu/*.c
     src/utils/*.c
     src/parsing/*.c)
 
-if (${CMAKE_BUILD_TYPE} MATCHES "Tests")
+if (CMAKE_BUILD_TYPE STREQUAL "Tests")
     list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/main.c")
-    set(SOURCES ${SOURCES} tests/tests_parsing.c tests/tests_corewar.c)
+    list(APPEND SOURCES
+        tests/tests_parsing.c
+        tests/tests_corewar.c)
+    find_package(criterion REQUIRED)
 endif()
 
-if(${CMAKE_BUILD_TYPE} MATCHES "Bonus")
-    add_compile_options(-Wall -Wextra -Wconversion -Wpedantic)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(SDL2 REQUIRED sdl2)
-    pkg_check_modules(SDL2_MIXER REQUIRED SDL2_mixer)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(RAYLIB REQUIRED raylib)
-    include_directories(${RAYLIB_INCLUDE_DIRS} bonus/include)
-    link_directories(${RAYLIB_LIBRARY_DIRS})
-    add_compile_definitions(BONUS_MODE=1)
-    set(SOURCES ${SOURCES} bonus/bonus.c bonus/transcribe_dot_s.c bonus/parse_champion.c bonus/menu/menu.c bonus/audio.c)
-    set(RAYLIB_LIBS ${RAYLIB_LIBRARIES} -lGL -lm -lpthread -ldl -lrt -lX11)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(SDL2 REQUIRED sdl2)
+pkg_check_modules(SDL2_MIXER REQUIRED SDL2_mixer)
+pkg_check_modules(RAYLIB REQUIRED raylib)
+
+include_directories(include ${RAYLIB_INCLUDE_DIRS})
+
+add_compile_definitions(BONUS_MODE=1)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_options(-Weverything -Wall -Wextra -Wconversion -Wpedantic
+        -fsanitize=address
+        -Wno-unsafe-buffer-usage
+        -Wno-pre-c23-compat -Wno-cast-qual -Wno-vla
+        -Wunused-result)
+    add_link_options(-fsanitize=address)
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Tests")
+    add_compile_options(--coverage)
+    add_link_options(--coverage)
 endif()
 
 add_executable(corewar ${SOURCES})
-target_include_directories(corewar PRIVATE include)
 
-if(${CMAKE_BUILD_TYPE} MATCHES "Bonus")
-    target_link_libraries(corewar PRIVATE ncurses ${RAYLIB_LIBS} ${SDL2_LIBRARIES} ${SDL2_MIXER_LIBRARIES})
-endif()
+target_link_libraries(corewar PRIVATE
+    ncurses
+    ${RAYLIB_LIBRARIES}
+    ${SDL2_LIBRARIES}
+    ${SDL2_MIXER_LIBRARIES}
+    m pthread dl rt X11)
 
-set_property(TARGET corewar PROPERTY C_STANDARD 23)
+if(CMAKE_BUILD_TYPE STREQUAL "Tests")
+    target_link_libraries(corewar PRIVATE criterion)
+endif()

Makefile

@@ -1,84 +1,40 @@
 NAME = corewar
-LIB = libmystd.a
-
 CC = clang
-CFLAGS = $(pkg-config --libs --cflags raylib) \
-         audio_player `sdl2-config --cflags --libs` -lSDL2_mixer
-LDFLAGS = -Llibs -lmystd
-
-CMAKE_DEBUG_FLAGS = -fsanitize=address -Weverything \
-                    -Wno-unsafe-buffer-usage \
-                    -Wno-pre-c23-compat -Wno-cast-qual -Wno-vla
-CMAKE_BONUS_FLAG = -O3 -Wno-unused-result
-CMAKE_TESTS_FLAGS = --coverage -lcriterion
-
-MAKEFLAGS += --no-print-directory
+BUILD_DIR = build
 
 .PHONY: all
-all: $(NAME)
-
-$(NAME):
-	@mkdir -p build
-	@cd build && CC=$(CC) cmake -DCMAKE_BUILD_TYPE=Debug \
-	        -DCMAKE_CXX_FLAGS="" \
-	        -DCMAKE_C_FLAGS="" \
-	        -DCMAKE_EXE_LINKER_FLAGS="" ..
-	@cmake --build build --parallel 12
-	@cp build/$(NAME) .
+all: release
 
-.PHONY: lib
-lib:
-	@mkdir -p build
-	@cd build && CC=$(CC) cmake -DCMAKE_BUILD_TYPE=Debug ..
-	@cmake --build build --target mystd --parallel 12
-	@cp build/libs/$(LIB) libs/
+.PHONY: release
+release:
+	@mkdir -p $(BUILD_DIR)
+	@cd $(BUILD_DIR) && cmake -DCMAKE_BUILD_TYPE=Release ..
+	@cmake --build $(BUILD_DIR) --parallel 12
+	@cp $(BUILD_DIR)/$(NAME) .
 
 .PHONY: debug
 debug:
-	@mkdir -p build
-	@cd build && CC=clang cmake -DCMAKE_BUILD_TYPE=Debug \
-	        -DCMAKE_CXX_FLAGS="-fsanitize=address" \
-	        -DCMAKE_C_FLAGS="$(CMAKE_DEBUG_FLAGS)" \
-	        -DCMAKE_EXE_LINKER_FLAGS="-fsanitize=address" ..
-	@cmake --build build --parallel 12
-	@cp build/$(NAME) .
-
-.PHONY: bonus
-bonus:
-	@mkdir -p build
-	@cd build && CC=$(CC) cmake -DCMAKE_BUILD_TYPE=Bonus \
-	        -DCMAKE_CXX_FLAGS="" \
-	        -DCMAKE_C_FLAGS="$(CMAKE_BONUS_FLAG)" \
-	        -DCMAKE_EXE_LINKER_FLAGS="" ..
-	@cmake --build build --parallel 12
-	@cp build/$(NAME) .
-
-.PHONY: tests_run
-tests_run: fclean
-	@mkdir -p build
-	@cd build && CC=gcc cmake -DCMAKE_BUILD_TYPE=Tests \
-	        -DCMAKE_CXX_FLAGS="" \
-	        -DCMAKE_C_FLAGS="$(CMAKE_TESTS_FLAGS)" \
-	        -DCMAKE_EXE_LINKER_FLAGS="" ..
-	@cmake --build build --parallel 12
-	@cp build/$(NAME) .
-	@./$(NAME) -j12
-
-.PHONY: coverage
-coverage:
-	@$(MAKE) tests_run 2>&1 1>/dev/null
-	@gcovr --sort uncovered-percent
+	@mkdir -p $(BUILD_DIR)
+	@cd $(BUILD_DIR) && cmake -DCMAKE_BUILD_TYPE=Debug ..
+	@cmake --build $(BUILD_DIR) --parallel 12
+	@cp $(BUILD_DIR)/$(NAME) .
+
+.PHONY: tests
+tests:
+	@mkdir -p $(BUILD_DIR)
+	@cd $(BUILD_DIR) && cmake -DCMAKE_BUILD_TYPE=Tests ..
+	@cmake --build $(BUILD_DIR) --parallel 12
+	@cp $(BUILD_DIR)/$(NAME) .
+	@./$(NAME)
 
 .PHONY: clean
 clean:
-	@rm -rf build
-	@rm -rf cmake-build-debug
-	@rm -f *.gcno *.gcda *.gcov *.html *.css
+	@rm -rf $(BUILD_DIR)
+	@rm -f *.gcno *.gcda *.gcov
 
 .PHONY: fclean
 fclean: clean
 	@rm -f $(NAME)
-	@rm -f libs/$(LIB)
 
 .PHONY: re
 re: fclean all