Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 28804) +++ trunk/scconfig/Rev.h (revision 28805) @@ -1 +1 @@ -static const int myrev = 28759; +static const int myrev = 28805; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 28804) +++ trunk/scconfig/Rev.tab (revision 28805) @@ -1,3 +1,4 @@ +28805 configure generate new header for librnd header integrity test 28759 configure compile standard extobjs by default 28609 configure layer code split (layer_addr.[ch]) 28441 configure remove old gcode plugin Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 28804) +++ trunk/scconfig/hooks.c (revision 28805) @@ -974,6 +974,8 @@ printf("Generating opengl.h (%d)\n", generr |= tmpasm("../src_plugins/lib_hid_gl", "opengl.h.in", "opengl.h")); + printf("Generating tests/librnd/inc_all.h (%d)\n", generr |= tmpasm("../tests/librnd", "inc_all.h.in", "inc_all.h")); + if (plug_is_enabled("export_vfs_fuse")) printf("Generating fuse_includes.h (%d)\n", generr |= tmpasm("../src_plugins/export_vfs_fuse", "fuse_includes.h.in", "fuse_includes.h")); Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 28804) +++ trunk/src_plugins/script/live_script.c (revision 28805) @@ -40,6 +40,7 @@ #include "compat_fs.h" #include "event.h" #include "undo.h" +#include "globalconst.h" #include "script.h" Index: trunk/tests/librnd/Makefile =================================================================== --- trunk/tests/librnd/Makefile (revision 28804) +++ trunk/tests/librnd/Makefile (revision 28805) @@ -4,15 +4,16 @@ include $(TRUNK)/Makefile.conf include $(SRC)/librnd.mak -CFLAGS = -I$(SRC) $(CFLAGS_LIBRND) +CFLAGS = $(CFLAGS_LIBRND) LDFLAGS = $(LDFLAGS_LIBRND) LIBRND =$(HL_LIBDIR)/librnd-poly.a $(HL_LIBDIR)/librnd-hid.a $(HL_LIBDIR)/librnd-3rd.a LIBRND_ROOT=include/$(HL_LIBDIR)/.. -all: librnd_test +all: librnd_test librnd_includes -test: librnd_test +test: librnd_test librnd_includes ./librnd_test --gui batch + ./librnd_includes librnd_test: librnd_test.o $(LIBRND) $(CC) -o librnd_test librnd_test.o $(LIBRND) $(LDFLAGS) Index: trunk/tests/librnd/librnd_includes.c =================================================================== --- trunk/tests/librnd/librnd_includes.c (revision 28804) +++ trunk/tests/librnd/librnd_includes.c (revision 28805) @@ -1,3 +1,8 @@ -int main() +/* header integrity test: nothing should be included from src/ that is + not part of librnd */ +#include "inc_all.h" + +int main(int argc, char *argv[]) { + return 0; }