Fixed some typos and quick non-fix for project to build.
This commit is contained in:
parent
ee4cde886d
commit
965015fa6d
|
|
@ -1,5 +1,5 @@
|
|||
[](https://www.gnu.org/licenses/gpl-3.0)
|
||||
# 2D_Engine_C SDL2 Core
|
||||
# 2D_Engine_C_SDL2_Core
|
||||
|
||||
## Description
|
||||
The core made on SDL2 for the multi-platform 2D_Engine_C.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
# Source files
|
||||
CORE_SOURCES := \
|
||||
asset_manager.c \
|
||||
texture_manager.c \
|
||||
event.c \
|
||||
vector2d.c \
|
||||
|
|
@ -8,7 +9,7 @@ CORE_SOURCES := \
|
|||
|
||||
# Compiler and flags
|
||||
CORE_CC = gcc
|
||||
CORE_CFLAGS = -Wall -Wextra -std=c17 -fPIC -g
|
||||
CORE_CFLAGS = -Wall -Wextra -std=c17 -fPIC -g -DASSET_FILE=$(ASSET_OUTPUT)
|
||||
CORE_INCLUDE_DIRS = $(CORE_DIR)/headers
|
||||
CORE_LDFLAGS = $(shell sdl2-config --cflags --libs)
|
||||
|
||||
|
|
@ -26,7 +27,7 @@ core_setup:
|
|||
@echo "Building libCore.so (1/3)"
|
||||
$(Q)mkdir -p $(dir $(CORE_OBJECTS))
|
||||
|
||||
# Count files to build
|
||||
# Count nb of files to build
|
||||
count_core_build:
|
||||
$(eval export TOTAL_CORE_FILES := $(shell echo $$(($$(make -n $(CORE_OBJECTS) 2>/dev/null | grep -c "Building") + 1))))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef MALLOC_H
|
||||
#define MALLOC_H
|
||||
#ifndef MEMORY_ALLOC_H
|
||||
#define MEMORY_ALLOC_H
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#endif // MALLOC_H
|
||||
#endif // MEMORY_ALLOC_H
|
||||
|
|
@ -37,6 +37,7 @@ inline void texture_manager_init(texture_manager_t *texture_manager)
|
|||
|
||||
inline void texture_manager_load_texture(texture_manager_t *texture_manager, const char *name)
|
||||
{
|
||||
texture_t *texture;
|
||||
linked_list_push_back(&texture_manager->textures, texture);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue