mirror of
https://github.com/nishiowo/nishbox
synced 2025-04-21 20:24:39 +00:00
dont commit stb_image
This commit is contained in:
parent
9dd8d426bd
commit
6f59b690fb
2
Makefile
2
Makefile
@ -16,7 +16,7 @@ LIBS = $(ODE_LIBS) $(AMX_LIBS) $(PAWNC_LIBS) $(GL_LIBS) $(SOCKET_LIBS)
|
||||
all: ./src
|
||||
|
||||
format:
|
||||
clang-format --verbose -i `find ./src ./engine "(" -name "*.c" -or -name "*.h" ")" -and -not -name "stb_image.h"`
|
||||
clang-format --verbose -i `find ./src ./engine "(" -name "*.c" -or -name "*.h" ")" -and -not -name "ext_*"`
|
||||
|
||||
./engine::
|
||||
$(MAKE) -C $@
|
||||
|
@ -7,4 +7,4 @@ all: $(TARGET)
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
clean:
|
||||
rm -f $(TARGET) *.a *.exe *.o
|
||||
rm -f $(TARGET) *.a *.exe *.o ext_*
|
||||
|
@ -5,3 +5,8 @@ include ../common.mk
|
||||
|
||||
$(TARGET): $(OBJS)
|
||||
$(AR) rcs $@ $(OBJS)
|
||||
|
||||
stb_image.c draw.c: ext_stb_image.h
|
||||
|
||||
ext_stb_image.h:
|
||||
wget https://github.com/nothings/stb/raw/refs/heads/master/stb_image.h -O $@
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* External library */
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#include "stb_image.h"
|
||||
#include "ext_stb_image.h"
|
||||
|
||||
/* Interface */
|
||||
#include "nb_draw.h"
|
||||
|
@ -16,11 +16,13 @@
|
||||
|
||||
#ifdef NB_EXPORT_DRAW
|
||||
typedef struct nb_shape {
|
||||
int points;
|
||||
GLfloat points[4][3];
|
||||
GLfloat points[3][3];
|
||||
GLfloat color[3];
|
||||
GLuint texture;
|
||||
} nb_shape_t;
|
||||
typedef struct nb_mesh {
|
||||
nb_shape_t* shapes;
|
||||
int shape_count;
|
||||
} nb_mesh_t;
|
||||
#else
|
||||
typedef void nb_mesh_t;
|
||||
|
@ -1,2 +1,2 @@
|
||||
#define STB_IMAGE_IMPLEMENTATION
|
||||
#include "stb_image.h"
|
||||
#include "ext_stb_image.h"
|
||||
|
7746
engine/stb_image.h
7746
engine/stb_image.h
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user