Changed default background color to black.
This commit is contained in:
parent
53ae1f59d3
commit
c8dd6e7cef
|
|
@ -20,8 +20,7 @@ asset_setup:
|
||||||
# Compress assets into tar file
|
# Compress assets into tar file
|
||||||
$(BUILD_DIR)/$(ASSET_OUTPUT): $(ASSETS:%=$(ASSETS_DIR)/%)
|
$(BUILD_DIR)/$(ASSET_OUTPUT): $(ASSETS:%=$(ASSETS_DIR)/%)
|
||||||
@echo -e "[100%] $(YELLOW)Compressing $(ASSET_OUTPUT)$(RESET)"
|
@echo -e "[100%] $(YELLOW)Compressing $(ASSET_OUTPUT)$(RESET)"
|
||||||
$(Q)tar -cf $(BUILD_DIR)/$(ASSETS_DIR)/assets.tar $^
|
$(Q)tar -cf $@ $^
|
||||||
$(Q)lz4 --favor-decSpeed -fqtz $(BUILD_DIR)/$(ASSETS_DIR)/assets.tar $@
|
|
||||||
|
|
||||||
# Print ending message
|
# Print ending message
|
||||||
assets_end: $(BUILD_DIR)/$(SOURCE_OUTPUT)
|
assets_end: $(BUILD_DIR)/$(SOURCE_OUTPUT)
|
||||||
|
|
|
||||||
11
src/Makefile
11
src/Makefile
|
|
@ -10,7 +10,16 @@ SOURCES := \
|
||||||
|
|
||||||
# Compiler and flags
|
# Compiler and flags
|
||||||
SRC_CC = gcc
|
SRC_CC = gcc
|
||||||
SRC_CFLAGS = -Wall -Wextra -std=c17 -g
|
#SRC_CFLAGS = -std=c17 -pedantic -O3 # RELEASE
|
||||||
|
SRC_CFLAGS = -std=c17 --pedantic -O0 -g \
|
||||||
|
-Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \
|
||||||
|
-Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \
|
||||||
|
-Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \
|
||||||
|
-Wstrict-prototypes -Winline -Wundef -Wnested-externs \
|
||||||
|
-Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \
|
||||||
|
-Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \
|
||||||
|
-Wold-style-definition # DEVELOPEMENT
|
||||||
|
|
||||||
SRC_INCLUDE_DIRS = $(SOURCE_DIR)/headers $(SOURCE_DIR)/ecs/headers $(SOURCE_DIR)/ecs/components/headers $(CORE_DIR)/$(CORE_SRC_DIR)/headers
|
SRC_INCLUDE_DIRS = $(SOURCE_DIR)/headers $(SOURCE_DIR)/ecs/headers $(SOURCE_DIR)/ecs/components/headers $(CORE_DIR)/$(CORE_SRC_DIR)/headers
|
||||||
SRC_LDFLAGS =
|
SRC_LDFLAGS =
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,16 @@
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <event.h>
|
#include <event.h>
|
||||||
#include <display.h>
|
#include <display.h>
|
||||||
|
#include <asset_manager.h>
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
#include "components.h"
|
#include "components.h"
|
||||||
|
|
||||||
void game_init(void)
|
void game_init(void)
|
||||||
{
|
{
|
||||||
display_init();
|
display_init();
|
||||||
|
asset_manager_init();
|
||||||
|
|
||||||
texture_manager_init(&game.texture_manager);
|
texture_manager_init(&game.texture_manager);
|
||||||
|
|
||||||
entity_manager_init(&game.entity_manager);
|
entity_manager_init(&game.entity_manager);
|
||||||
|
|
||||||
entity_t *player = create_entity(0);
|
entity_t *player = create_entity(0);
|
||||||
|
|
@ -71,5 +72,6 @@ void game_exit(void)
|
||||||
entity_manager_clear(&game.entity_manager);
|
entity_manager_clear(&game.entity_manager);
|
||||||
texture_manager_clear(&game.texture_manager);
|
texture_manager_clear(&game.texture_manager);
|
||||||
|
|
||||||
|
asset_manager_exit();
|
||||||
display_exit();
|
display_exit();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ int main(void)
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
display_clear(COLOR_WHITE);
|
display_clear(C_BLACK);
|
||||||
|
|
||||||
texture_manager_t texture_manager;
|
texture_manager_t texture_manager;
|
||||||
texture_manager_init(&texture_manager);
|
texture_manager_init(&texture_manager);
|
||||||
|
|
@ -72,7 +72,7 @@ int main(void)
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
display_clear(COLOR_WHITE);
|
display_clear(C_BLACK);
|
||||||
|
|
||||||
linked_list_t linked_list;
|
linked_list_t linked_list;
|
||||||
linked_list_init(&linked_list, sizeof(int), NULL);
|
linked_list_init(&linked_list, sizeof(int), NULL);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue