nishi/nishbox
1
Fork 0
mirror of https://github.com/nishiowo/nishbox synced 2025-04-21 20:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

add stuffs

Browse Source
This commit is contained in:
NishiOwO 2025-04-07 17:49:11 +09:00
parent 427c1b399f
commit 77ac1987d9
No known key found for this signature in database
GPG Key ID: 27EF69B208EB9343
8 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in generated
View File

@ -240,6 +240,7 @@ NB_BACKEND = @NB_BACKEND@
NB_CPPFLAGS = @NB_CPPFLAGS@
NB_DRIVER = @NB_DRIVER@
NB_LDADD = @NB_LDADD@
NB_THREAD = @NB_THREAD@
OBJEXT = @OBJEXT@
ODE_CFLAGS = @ODE_CFLAGS@
ODE_LIBS = @ODE_LIBS@

2
engine/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/common-automake.mk
lib_LIBRARIES = libnishbox.a
libnishbox_a_SOURCES = \
nb_core.c nb_draw.c nb_font.c nb_log.c nb_math.c nb_mesh.c nb_model.c nb_physics.c nb_stb_image.c nb_texture.c nb_version.c @NB_DRIVER@/nb_driver.c @NB_DRIVER@/nb_graphic.c @NB_DRIVER@/@NB_BACKEND@/nb_draw.c \
nb_core.c nb_draw_common.c nb_font.c nb_log.c nb_math.c nb_mesh.c nb_model.c nb_physics.c nb_stb_image.c nb_texture.c nb_version.c @NB_DRIVER@/nb_driver.c @NB_DRIVER@/nb_graphic.c @NB_DRIVER@/@NB_BACKEND@/nb_draw.c \
../external/lua/lapi.c ../external/lua/lauxlib.c ../external/lua/lbaselib.c ../external/lua/lcode.c ../external/lua/lcorolib.c ../external/lua/lctype.c ../external/lua/ldblib.c ../external/lua/ldebug.c ../external/lua/ldo.c ../external/lua/ldump.c ../external/lua/lfunc.c ../external/lua/lgc.c ../external/lua/linit.c ../external/lua/liolib.c ../external/lua/llex.c ../external/lua/lmathlib.c ../external/lua/lmem.c ../external/lua/loadlib.c ../external/lua/lobject.c ../external/lua/lopcodes.c ../external/lua/loslib.c ../external/lua/lparser.c ../external/lua/lstate.c ../external/lua/lstring.c ../external/lua/lstrlib.c ../external/lua/ltable.c ../external/lua/ltablib.c ../external/lua/ltests.c ../external/lua/ltm.c ../external/lua/lua.c ../external/lua/lundump.c ../external/lua/lutf8lib.c ../external/lua/lvm.c ../external/lua/lzio.c ../external/lua/onelua.c \
../external/zlib/adler32.c ../external/zlib/compress.c ../external/zlib/crc32.c ../external/zlib/deflate.c ../external/zlib/gzclose.c ../external/zlib/gzlib.c ../external/zlib/gzread.c ../external/zlib/gzwrite.c ../external/zlib/infback.c ../external/zlib/inffast.c ../external/zlib/inflate.c ../external/zlib/inftrees.c ../external/zlib/trees.c ../external/zlib/uncompr.c ../external/zlib/zutil.c

15
engine/Makefile.in generated
View File

@ -132,7 +132,7 @@ am__v_AR_1 =
libnishbox_a_AR = $(AR) $(ARFLAGS)
libnishbox_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am_libnishbox_a_OBJECTS = nb_core.$(OBJEXT) nb_draw.$(OBJEXT) \
am_libnishbox_a_OBJECTS = nb_core.$(OBJEXT) nb_draw_common.$(OBJEXT) \
nb_font.$(OBJEXT) nb_log.$(OBJEXT) nb_math.$(OBJEXT) \
nb_mesh.$(OBJEXT) nb_model.$(OBJEXT) nb_physics.$(OBJEXT) \
nb_stb_image.$(OBJEXT) nb_texture.$(OBJEXT) \
@ -251,7 +251,7 @@ am__depfiles_remade = ../external/lua/$(DEPDIR)/lapi.Po \
../external/zlib/$(DEPDIR)/trees.Po \
../external/zlib/$(DEPDIR)/uncompr.Po \
../external/zlib/$(DEPDIR)/zutil.Po ./$(DEPDIR)/nb_core.Po \
./$(DEPDIR)/nb_draw.Po ./$(DEPDIR)/nb_font.Po \
./$(DEPDIR)/nb_draw_common.Po ./$(DEPDIR)/nb_font.Po \
./$(DEPDIR)/nb_log.Po ./$(DEPDIR)/nb_math.Po \
./$(DEPDIR)/nb_mesh.Po ./$(DEPDIR)/nb_model.Po \
./$(DEPDIR)/nb_physics.Po ./$(DEPDIR)/nb_stb_image.Po \
@ -343,6 +343,7 @@ NB_BACKEND = @NB_BACKEND@
NB_CPPFLAGS = @NB_CPPFLAGS@
NB_DRIVER = @NB_DRIVER@
NB_LDADD = @NB_LDADD@
NB_THREAD = @NB_THREAD@
OBJEXT = @OBJEXT@
ODE_CFLAGS = @ODE_CFLAGS@
ODE_LIBS = @ODE_LIBS@
@ -406,10 +407,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = @NB_CPPFLAGS@ -DDRV_@NB_DRIVER@ -DUSE_@NB_BACKEND@ -I$(top_srcdir)/engine/include -I$(top_srcdir)/external/lua -I$(top_srcdir)/external/stb -I$(top_srcdir)/external/zlib -I$(top_srcdir)/deps/include
AM_CPPFLAGS = @NB_CPPFLAGS@ -DDRV_@NB_DRIVER@ -DUSE_@NB_BACKEND@ -DTHREAD_@NB_THREAD@ -I$(top_srcdir)/engine/include -I$(top_srcdir)/external/lua -I$(top_srcdir)/external/stb -I$(top_srcdir)/external/zlib -I$(top_srcdir)/deps/include
lib_LIBRARIES = libnishbox.a
libnishbox_a_SOURCES = \
nb_core.c nb_draw.c nb_font.c nb_log.c nb_math.c nb_mesh.c nb_model.c nb_physics.c nb_stb_image.c nb_texture.c nb_version.c @NB_DRIVER@/nb_driver.c @NB_DRIVER@/nb_graphic.c @NB_DRIVER@/@NB_BACKEND@/nb_draw.c \
nb_core.c nb_draw_common.c nb_font.c nb_log.c nb_math.c nb_mesh.c nb_model.c nb_physics.c nb_stb_image.c nb_texture.c nb_version.c @NB_DRIVER@/nb_driver.c @NB_DRIVER@/nb_graphic.c @NB_DRIVER@/@NB_BACKEND@/nb_draw.c \
../external/lua/lapi.c ../external/lua/lauxlib.c ../external/lua/lbaselib.c ../external/lua/lcode.c ../external/lua/lcorolib.c ../external/lua/lctype.c ../external/lua/ldblib.c ../external/lua/ldebug.c ../external/lua/ldo.c ../external/lua/ldump.c ../external/lua/lfunc.c ../external/lua/lgc.c ../external/lua/linit.c ../external/lua/liolib.c ../external/lua/llex.c ../external/lua/lmathlib.c ../external/lua/lmem.c ../external/lua/loadlib.c ../external/lua/lobject.c ../external/lua/lopcodes.c ../external/lua/loslib.c ../external/lua/lparser.c ../external/lua/lstate.c ../external/lua/lstring.c ../external/lua/lstrlib.c ../external/lua/ltable.c ../external/lua/ltablib.c ../external/lua/ltests.c ../external/lua/ltm.c ../external/lua/lua.c ../external/lua/lundump.c ../external/lua/lutf8lib.c ../external/lua/lvm.c ../external/lua/lzio.c ../external/lua/onelua.c \
../external/zlib/adler32.c ../external/zlib/compress.c ../external/zlib/crc32.c ../external/zlib/deflate.c ../external/zlib/gzclose.c ../external/zlib/gzlib.c ../external/zlib/gzread.c ../external/zlib/gzwrite.c ../external/zlib/infback.c ../external/zlib/inffast.c ../external/zlib/inflate.c ../external/zlib/inftrees.c ../external/zlib/trees.c ../external/zlib/uncompr.c ../external/zlib/zutil.c
@ -676,7 +677,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@../external/zlib/$(DEPDIR)/uncompr.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@../external/zlib/$(DEPDIR)/zutil.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nb_core.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nb_draw.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nb_draw_common.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nb_font.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nb_log.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nb_math.Po@am__quote@ # am--include-marker
@ -897,7 +898,7 @@ distclean: distclean-am
-rm -f ../external/zlib/$(DEPDIR)/uncompr.Po
-rm -f ../external/zlib/$(DEPDIR)/zutil.Po
-rm -f ./$(DEPDIR)/nb_core.Po
-rm -f ./$(DEPDIR)/nb_draw.Po
-rm -f ./$(DEPDIR)/nb_draw_common.Po
-rm -f ./$(DEPDIR)/nb_font.Po
-rm -f ./$(DEPDIR)/nb_log.Po
-rm -f ./$(DEPDIR)/nb_math.Po
@ -1006,7 +1007,7 @@ maintainer-clean: maintainer-clean-am
-rm -f ../external/zlib/$(DEPDIR)/uncompr.Po
-rm -f ../external/zlib/$(DEPDIR)/zutil.Po
-rm -f ./$(DEPDIR)/nb_core.Po
-rm -f ./$(DEPDIR)/nb_draw.Po
-rm -f ./$(DEPDIR)/nb_draw_common.Po
-rm -f ./$(DEPDIR)/nb_font.Po
-rm -f ./$(DEPDIR)/nb_log.Po
-rm -f ./$(DEPDIR)/nb_math.Po

1
engine/include/nb_type/version.h
View File

@ -19,6 +19,7 @@ NB_DECLARE_TYPE(version, {
char opengl[32];
char lua[32];
char zlib[32];
char thread[32];
});
#else
#error "should not happen!"

1
engine/nb_core.c
View File

@ -29,6 +29,7 @@ void nb_engine_begin(void) {
nb_function_log("NishBox engine %s", ver.full);
nb_function_log("Lua %s", ver.lua);
nb_function_log("zlib %s", ver.zlib);
nb_function_log("Thread model: %s", ver.thread);
nb_function_log("OpenGL backend: %s", ver.opengl);
#ifdef _WIN32
WSAStartup(MAKEWORD(1, 1), &wsa);

0
engine/nb_draw.c → engine/nb_draw_common.c
View File

19
engine/nb_version.c
View File

@ -16,12 +16,17 @@
#define NB_VERSION PACKAGE_VERSION
void nb_get_version(nb_version_t* version) {
char* cpstr = malloc(strlen(NB_VERSION) + 1);
char* cpstr = malloc(512);
int i;
int incr = 0;
int old = 0;
strcpy(cpstr, NB_VERSION);
strcpy(version->full, NB_VERSION);
strcpy(version->zlib, ZLIB_VERSION);
strcpy(cpstr, LUA_RELEASE);
strcpy(version->lua, cpstr + 4);
#if defined(USE_GLX)
strcpy(version->opengl, "GLX");
#elif defined(USE_WGL)
@ -29,8 +34,14 @@ void nb_get_version(nb_version_t* version) {
#elif defined(USE_GLFW)
strcpy(version->opengl, "GLFW");
#endif
strcpy(version->zlib, ZLIB_VERSION);
strcpy(version->lua, LUA_RELEASE);
#if defined(THREAD_WIN32)
strcpy(version->thread, "Win32");
#elif defined(THREAD_POSIX)
strcpy(version->thread, "POSIX");
#endif
strcpy(cpstr, NB_VERSION);
for(i = 0;; i++) {
if(cpstr[i] == '.' || cpstr[i] == 0) {
int num;

3
src/Makefile.in generated
View File

@ -201,6 +201,7 @@ NB_BACKEND = @NB_BACKEND@
NB_CPPFLAGS = @NB_CPPFLAGS@
NB_DRIVER = @NB_DRIVER@
NB_LDADD = @NB_LDADD@
NB_THREAD = @NB_THREAD@
OBJEXT = @OBJEXT@
ODE_CFLAGS = @ODE_CFLAGS@
ODE_LIBS = @ODE_LIBS@
@ -264,7 +265,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = @NB_CPPFLAGS@ -DDRV_@NB_DRIVER@ -DUSE_@NB_BACKEND@ -I$(top_srcdir)/engine/include -I$(top_srcdir)/external/lua -I$(top_srcdir)/external/stb -I$(top_srcdir)/external/zlib -I$(top_srcdir)/deps/include
AM_CPPFLAGS = @NB_CPPFLAGS@ -DDRV_@NB_DRIVER@ -DUSE_@NB_BACKEND@ -DTHREAD_@NB_THREAD@ -I$(top_srcdir)/engine/include -I$(top_srcdir)/external/lua -I$(top_srcdir)/external/stb -I$(top_srcdir)/external/zlib -I$(top_srcdir)/deps/include
nishbox_SOURCES = main.c
nishbox_LDADD = ../engine/libnishbox.a @NB_LDADD@
all: all-am