thepigeongenerator/mcaselector-lite
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/mcaselector-lite.git synced 2025-12-19 05:25:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: thepigeongenerator:88eae600c4376158dc7b27f973e77d3462ac9e9f
Branches Tags
thepigeongenerator:main
..
compare: thepigeongenerator:7db3e9708553fcb78d1e053d3377dfdfcb863971
Branches Tags
thepigeongenerator:main

5 Commits
88eae600c4 ... 7db3e97085

Author SHA1 Message Date
Quinn
7db3e97085 seperate out library compilation from general compilation 
This can help with a more nuanced compilation. (eg. use system libraries
rather than compile our own)
Furthermore, it decreases the needed compilation time, since we needn't
recompile the whole thing when having cleaned out our local sources.
 2025-09-12 17:44:34 +02:00
Quinn
ed5aed474e fix: log macros were using GNU extensions without them needing them. 
We can optionally add `,` utilising the `__VA_OPT__` macro. However,
this lead to the next problem, which is that an empty vardiac parameter
is a C23 extension. This was solved by dropping the string parameter,
making it be part of the vardiac parameters.
 2025-09-12 17:44:34 +02:00
Quinn
14caacf95e fix: using __bswap_X functions over bswap_X macros, which we should be using. 2025-09-12 17:44:34 +02:00
Quinn
e377b4ee29 add compile commands events to gitignore 2025-09-12 17:44:34 +02:00
Quinn
21bb6ff79a rework makefile to put extera emphasis on us no longer performing cross-platform compilation 
Furthermore, we removed a bunch of behaviour that wasn't needed, and
simplified the bunch.
 2025-09-12 17:44:34 +02:00
4 changed files with 30 additions and 25 deletions
Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -18,4 +18,6 @@
*.lock *.lock
/bin/ /bin/
/obj/ /obj/
/lib/obj/
compile_commands.json compile_commands.json
compile_commands.events.json

19
Makefile
View File

@@ -22,9 +22,8 @@ else
CFLAGS += -fsanitize=address -ftrapv -g CFLAGS += -fsanitize=address -ftrapv -g
LDFLAGS += -fsanitize=address -ftrapv LDFLAGS += -fsanitize=address -ftrapv
endif endif
# TODO: correctly add all libraries and headers here
CPPFLAGS += -Iinclude -Ilib/glad/include -Ilib/glfw/include -Ilib/libarchive/libarchive CPPFLAGS += -Iinclude -Ilib/glad/include -Ilib/glfw/include -Ilib/libarchive/libarchive
LDFLAGS += -Lobj/lib/glfw/src -Lobj/lib/libarchive/libarchive LDFLAGS += -Llib/obj/glfw/src -Llib/obj/libarchive/libarchive
LDLIBS += -lm -lglfw -larchive LDLIBS += -lm -lglfw -larchive
# detect if we're compiling on Windows, meaning # detect if we're compiling on Windows, meaning
@@ -36,7 +35,7 @@ $(warning Detected Windows_NT, please refer to the documentation if you encounte
endif endif
# TODO: find a better method to find all source files # TODO: find a better method to find all source files
# TODO: find a better method for selecting the object files # WARN: find a better method for selecting the object files
# find all the source files using wildcards # find all the source files using wildcards
# NOTE: MS-DOS and MS-Windows uses backslash `\`, this might break. # NOTE: MS-DOS and MS-Windows uses backslash `\`, this might break.
RES := $(wildcard res/*.glsl) RES := $(wildcard res/*.glsl)
@@ -44,27 +43,31 @@ SRC := $(wildcard src/*.c src/*/*.c src/*/*/*.c src/*/*/*/*.c src/*/*/*/*/*
OBJ := $(SRC:%.c=obj/%.o) OBJ := $(SRC:%.c=obj/%.o)
TEST := $(wildcard test/*.c test/*/*.c test/*/*/*.c test/*/*/*/*.c test/*/*/*/*/*.c test/*/*/*/*/*/*.c test/*/*/*/*/*/*/*.c test/*/*/*/*/*/*/*/*.c) TEST := $(wildcard test/*.c test/*/*.c test/*/*/*.c test/*/*/*/*.c test/*/*/*/*/*.c test/*/*/*/*/*/*.c test/*/*/*/*/*/*/*.c test/*/*/*/*/*/*/*/*.c)
.PHONY: all test clean libs # TODO: potentially automatically detect whether we should compile libs, or if we can just go ahead.
.PHONY: all libs test clean clean-libs
all: bin/$(NAME) all: bin/$(NAME)
libs: obj/lib/glfw/ obj/lib/libarchive/ libs: lib/obj/glfw/ lib/obj/libarchive/
test: bin/TEST_$(NAME); bin/TEST_$(NAME) test: bin/TEST_$(NAME); bin/TEST_$(NAME)
clean: clean:
@[ -d bin/ ] && rm -vr bin/ || true @[ -d bin/ ] && rm -vr bin/ || true
@[ -d obj/ ] && rm -vr obj/ || true @[ -d obj/ ] && rm -vr obj/ || true
clean-libs:
@[ -d lib/obj/ ] && rm -vr lib/obj/
# compiles the libraries using cmake # compiles the libraries using cmake
obj/lib/%/: lib/%/ lib/obj/%/: lib/%/
cmake -S $< -B $@ cmake -S $< -B $@
$(MAKE) -C $@ $(MAKE) -C $@
# link together a runtime binary # link together a runtime binary
bin/$(NAME): libs $(OBJ) bin/$(NAME): $(OBJ)
$(info [CC/LD] $@) $(info [CC/LD] $@)
@mkdir -p $(@D) @mkdir -p $(@D)
@$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) @$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
# link together a testing binary # link together a testing binary
# TODO: testing sources must be selected better # BUG: testing sources must be selected better
bin/TEST_$(NAME): $(OBJ) bin/TEST_$(NAME): $(OBJ)
$(info [CC/LD] $@) $(info [CC/LD] $@)
@mkdir -p $(@D) @mkdir -p $(@D)

24
include/endian.h
View File

@@ -16,19 +16,19 @@
#define htole16(x) (x) #define htole16(x) (x)
#define htole32(x) (x) #define htole32(x) (x)
#define htole64(x) (x) #define htole64(x) (x)
#define be16toh(x) __bswap_16(x) #define be16toh(x) bswap_16(x)
#define be32toh(x) __bswap_32(x) #define be32toh(x) bswap_32(x)
#define be64toh(x) __bswap_64(x) #define be64toh(x) bswap_64(x)
#define htobe16(x) __bswap_16(x) #define htobe16(x) bswap_16(x)
#define htobe32(x) __bswap_32(x) #define htobe32(x) bswap_32(x)
#define htobe64(x) __bswap_64(x) #define htobe64(x) bswap_64(x)
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define le16toh(x) __bswap_16(x) #define le16toh(x) bswap_16(x)
#define le32toh(x) __bswap_32(x) #define le32toh(x) bswap_32(x)
#define le64toh(x) __bswap_64(x) #define le64toh(x) bswap_64(x)
#define htole16(x) __bswap_16(x) #define htole16(x) bswap_16(x)
#define htole32(x) __bswap_32(x) #define htole32(x) bswap_32(x)
#define htole64(x) __bswap_64(x) #define htole64(x) bswap_64(x)
#define be16toh(x) (x) #define be16toh(x) (x)
#define be32toh(x) (x) #define be32toh(x) (x)
#define be64toh(x) (x) #define be64toh(x) (x)

10
src/error.h
View File

@@ -15,8 +15,8 @@ void error_war(uint ln, const char *restrict file, const char *restrict fmt, ...
void error_err(uint ln, const char *restrict file, const char *restrict fmt, ...); void error_err(uint ln, const char *restrict file, const char *restrict fmt, ...);
void error_fat(uint ln, const char *restrict file, const char *restrict fmt, ...) NORET; void error_fat(uint ln, const char *restrict file, const char *restrict fmt, ...) NORET;
#define debug(s, ...) error_dbg(__LINE__, __FILE__, s, ##__VA_ARGS__) #define debug(...) error_dbg(__LINE__, __FILE__ __VA_OPT__(, ) __VA_ARGS__)
#define info(s, ...) error_inf(__LINE__, __FILE__, s, ##__VA_ARGS__) #define info(...) error_inf(__LINE__, __FILE__ __VA_OPT__(, ) __VA_ARGS__)
#define warn(s, ...) error_war(__LINE__, __FILE__, s, ##__VA_ARGS__) #define warn(...) error_war(__LINE__, __FILE__ __VA_OPT__(, ) __VA_ARGS__)
#define error(s, ...) error_err(__LINE__, __FILE__, s, ##__VA_ARGS__) #define error(...) error_err(__LINE__, __FILE__ __VA_OPT__(, ) __VA_ARGS__)
#define fatal(s, ...) error_fat(__LINE__, __FILE__, s, ##__VA_ARGS__) #define fatal(...) error_fat(__LINE__, __FILE__ __VA_OPT__(, ) __VA_ARGS__)