Index: trunk/tests/propedit/glue.c =================================================================== --- trunk/tests/propedit/glue.c (revision 34776) +++ trunk/tests/propedit/glue.c (nonexistent) @@ -1,41 +0,0 @@ -#include -#include -#include - -TODO - -/*** hidlib glue ***/ - -const char *rnd_hidlib_default_embedded_menu = ""; -const char *rnd_menu_file_paths[] = { "./", NULL }; -const char *rnd_menu_name_fmt = "menu.lht"; - -const char *rnd_conf_userdir_path = "./"; -const char *rnd_conf_user_path = "./conf.lht"; - -/* hack for running from ./ without internal version of the conf */ -const char *rnd_conf_sysdir_path = "./"; -const char *rnd_conf_sys_path = "./conf.lht"; - -const char *rnd_app_package = "librnd_test"; -const char *rnd_app_version = "0.0.0"; -const char *rnd_app_url = "n/a"; - - -typedef struct design_s { - rnd_hidlib_t hidlib; /* shall be the first */ -} design_t; - -design_t CTX; - -const pup_buildin_t local_buildins[] = { - {NULL, NULL, NULL, NULL, 0, NULL} -}; - -static const char *action_args[] = { - NULL, NULL, NULL, NULL, NULL /* terminator */ -}; - -void conf_core_init() -{ -} Index: trunk/tests/propedit/Makefile =================================================================== --- trunk/tests/propedit/Makefile (revision 34776) +++ trunk/tests/propedit/Makefile (revision 34777) @@ -2,6 +2,7 @@ ROOT=../.. include $(ROOT)/Makefile.conf +include $(LIBRND_MAK) PED=$(ROOT)/src_plugins/propedit LHT=$(ROOT)/src_3rd @@ -8,16 +9,11 @@ SRC=$(ROOT)/src SRC_3RD=$(ROOT)/src_3rd -CFLAGS = $(PCB_RND_C89FLAGS) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd -LDLIBS = -lm -LIB_OBJS = \ - $(SRC_3RD)/librnd-local/src/librnd-hid.a \ - $(SRC_3RD)/librnd-local/src/librnd-3rd.a \ - glue.o \ +CFLAGS = $(PCB_RND_C89FLAGS) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd -I$(LIBRND_INCDIR)/librnd/src_3rd +LDLIBS = -lrnd-hid -lrnd-3rd $(LDFLAGS_LIBRND) -lm OBJS = tester.o $(PED)/props.o - test: tester.diff @echo "propedit: *** QC PASS ***" @rm tester.out @@ -35,8 +31,5 @@ tester.out: tester ./tester > tester.out -glue.o: glue.c - $(CC) -c $(CFLAGS) glue.c -o glue.o - clean: -$(SCCBOX) rm -f tester.out tester $(OBJS)