diff --git a/Makefile b/Makefile index 21fba7c..6fc4787 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CFLAGS = -std=c11 -O3 -g -Wall -Wextra -Wpedantic -Wstrict-aliasing CFLAGS += -Wno-pointer-arith -Wno-newline-eof -Wno-unused-parameter -Wno-gnu-statement-expression CFLAGS += -Wno-gnu-compound-literal-initializer -Wno-gnu-zero-variadic-macro-arguments CFLAGS += -Ilib/cglm/include -Ilib/glad/include -Ilib/glfw/include -Ilib/stb -Ilib/noise -fbracket-depth=1024 -LDFLAGS = lib/glad/src/glad.o lib/cglm/libcglm.a lib/glfw/src/libglfw3.a lib/noise/libnoise.a -lm +LDFLAGS = lib/glad/src/glad.o lib/cglm/libcglm.a lib/glfw/src/libglfw3.a lib/noise/noise1234.o -lm # GLFW required frameworks on OSX ifeq ($(UNAME_S), Darwin) diff --git a/README.md b/README.md index 98fc10d..6632a8c 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ `$ git clone --recurse-submodules https://github.com/jdah/minecraft-weekend.git`\ `$ make` +Note: FreeBSD users have to substitute `make` with `gmake`. + The following static libraries under `lib/` must be built before the main project can be built: - GLAD `lib/glad/src/glad.o` diff --git a/src/util/sort.h b/src/util/sort.h index 724e1f5..20e6c33 100644 --- a/src/util/sort.h +++ b/src/util/sort.h @@ -25,7 +25,7 @@ static inline void sort_r( #if (defined _GNU_SOURCE || defined __GNU__ || defined __linux__) qsort_r(base, nel, width, cmp, arg); #elif (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \ - defined __FREEBSD__ || defined __BSD__ || \ + defined __FreeBSD__ || defined __BSD__ || \ defined OpenBSD3_1 || defined OpenBSD3_9) struct _sort_data tmp = {arg, cmp}; qsort_r(base, nel, width, &tmp, &_sort_r_arg_swap); @@ -37,4 +37,4 @@ static inline void sort_r( #endif } -#endif \ No newline at end of file +#endif