From b49c2b36c9b5a28959a91c0032a5c05cc3473ab4 Mon Sep 17 00:00:00 2001 From: John Alanbrook Date: Wed, 29 Jun 2022 03:13:39 +0000 Subject: [PATCH] t --- Makefile | 9 +++------ source/engine/mathc.h | 1 + source/engine/mesh.c | 2 +- source/engine/model.c | 2 +- source/engine/skybox.c | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 8d89df9..94ff0ac 100755 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ endif UNAME_P != uname -m -CCACHE = ccache +CCACHE = #ccache #CC specifies which compiler we're using CC = $(CCACHE) tcc @@ -83,8 +83,7 @@ WARNING_FLAGS = -Wno-everything#-Wall -Wextra -Wwrite-strings -Wno-unused-parame -COMPILER_FLAGS = $(includeflag) -I/usr/local/include -g -O0 $(WARNING_FLAGS) -MD -c $< -o $@ -#-D_POSIX_C_SOURCE=1993809L +COMPILER_FLAGS = $(includeflag) -I/usr/local/include -g -O0 -MD $(WARNING_FLAGS) -c $< -o $@ LIBPATH = -L./bin -L/usr/local/lib -L/usr/local/lib/tcc @@ -104,9 +103,7 @@ else endif ELIBS != $(call prefix, $(ELIBS), -l) -#CLIBS != $(call prefix, $(CLIBS), -l) -#LELIBS = -Wl,-Bstatic $(ELIBS)# -Wl,-Bdynamic $(CLIBS) LELIBS = $(ELIBS) $(CLIBS) objects = $(bsobjects) $(eobjects) $(pinobjects) @@ -169,4 +166,4 @@ tags: $(ALLFILES) clean: @echo Cleaning project - @find $(BIN) -type f -delete \ No newline at end of file + @find $(BIN) -type f -delete diff --git a/source/engine/mathc.h b/source/engine/mathc.h index 83e96b7..27df7eb 100755 --- a/source/engine/mathc.h +++ b/source/engine/mathc.h @@ -25,6 +25,7 @@ extern "C" { #ifndef MATHC_H #define MATHC_H +#include // CONFIG diff --git a/source/engine/mesh.c b/source/engine/mesh.c index 3dd3a20..5c434a0 100755 --- a/source/engine/mesh.c +++ b/source/engine/mesh.c @@ -15,7 +15,7 @@ void DrawMesh(struct mMesh *mesh, struct mShader *shader) uint32_t normalNr = 1; uint32_t heightNr = 1; - for (uint32_t i = 0; i < (mesh->te - mesh->textures); i++) { + for (int i = 0; i < (mesh->te - mesh->textures); i++) { glActiveTexture(GL_TEXTURE0 + i); // active proper texture unit before binding // retrieve texture number (the N in diffuse_textureN) char number = 0; diff --git a/source/engine/model.c b/source/engine/model.c index 082468a..50e0fcc 100755 --- a/source/engine/model.c +++ b/source/engine/model.c @@ -59,7 +59,7 @@ void draw_model(struct mModel *model, struct mShader *shader) { if (lastRendered != model) { lastRendered = model; - for (uint32_t i = 0; i < (model->mp - model->meshes); i++) + for (int i = 0; i < (model->mp - model->meshes); i++) DrawMesh(&model->meshes[i], shader); } else { for (uint32_t i = 0; i < (model->mp - model->meshes); i++) diff --git a/source/engine/skybox.c b/source/engine/skybox.c index 27aa32d..0b5a4ff 100755 --- a/source/engine/skybox.c +++ b/source/engine/skybox.c @@ -83,7 +83,7 @@ struct mSkybox *MakeSkybox(const char *cubemap) glBindTexture(GL_TEXTURE_CUBE_MAP, newskybox->id); /*char buf[100] = { '\0' };*/ - for (unsigned int i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) { /* buf[0] = '\0'; strcat(buf, cubemap);