Move texture type selection out of C and into build system

malc committed 5 years ago

Commit 0419a3f1 parent 4d0746b2 files · +3 −7Browse files

Unified · Split

2 files

build.bash +3 −1
link.c +0 −6

build.bash+3−1

@@ -84,7 +84,9 @@ cflags() { · 83 unmodified lines
84	84	test "${mbt-}" = "debug" \|\| f+="-O2 "
85	85	$darwin && f+="-DCIDER -D_GNU_SOURCE -DGL_H='<OpenGL/gl.h>'" \
86	86	\|\| f+="-D_POSIX_C_SOURCE -DGL_H='<GL/gl.h>'"
87		− f+=" -include $srcd/diag.h -DFIXME=0"
	87	+ f+=" -include $srcd/diag.h -DFIXME=0 "
	88	+ f+=" -DTEXT_TYPE=GL_TEXTURE_RECTANGLE_ARB"
	89	+ #f+=" -DTEXT_TYPE=GL_TEXTURE_2D"
88	90	;;
89	91
90	92	/ml_.o)

link.c+0−6

@@ -46,12 +46,6 @@ · 45 unmodified lines
46	46
47	47	#include "cutils.h"
48	48
49		−#ifdef USE_NPOT
50		−#define TEXT_TYPE GL_TEXTURE_2D
51		−#else
52		−#define TEXT_TYPE GL_TEXTURE_RECTANGLE_ARB
53		−#endif
54		−
55	49	#define ARSERT(c) !(c) ? errx (1, "%s:%d " #c, __FILE__, __LINE__) : (void) 0
56	50	#define ML(d) extern value ml_##d; value ml_##d
57	51	#define ML0(d) extern void ml_##d; void ml_##d