diff options
| author | Uros Majstorovic <majstor@majstor.org> | 2020-02-26 16:16:03 +0100 |
|---|---|---|
| committer | Uros Majstorovic <majstor@majstor.org> | 2020-02-26 16:16:03 +0100 |
| commit | 682c9588dc3d281cfdca22f0d6470c9f21e4ccad (patch) | |
| tree | 4ccc40700a11f26d5bdd889dddf184606745fa07 /code | |
| parent | 819f823ec215d5c9f4ae6c3d05cd9048e22703b7 (diff) | |
fixed build system
Diffstat (limited to 'code')
| -rw-r--r-- | code/ecp/Makefile | 4 | ||||
| -rw-r--r-- | code/ecp/crypto/Makefile | 4 | ||||
| -rw-r--r-- | code/fe310/Makefile | 6 | ||||
| -rw-r--r-- | code/fe310/eos/eve/eve_kbd.c | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/code/ecp/Makefile b/code/ecp/Makefile index 972f8d7..9456a4b 100644 --- a/code/ecp/Makefile +++ b/code/ecp/Makefile @@ -13,7 +13,7 @@ subdirs = crypto platform $(htable) $(vconn) all: $(obj) $(AR) rcs libecpcore.a $(obj) for i in $(subdirs); do \ - (cd $$i && $(MAKE) && cd ..) || exit; \ + (cd $$i && $(MAKE)) || exit; \ done install: all @@ -31,6 +31,6 @@ install: all clean: for i in $(subdirs); do \ - (cd $$i && $(MAKE) clean && cd ..) || exit; \ + (cd $$i && $(MAKE) clean) || exit; \ done rm -f *.o *.a
\ No newline at end of file diff --git a/code/ecp/crypto/Makefile b/code/ecp/crypto/Makefile index ecef58d..cbbc60f 100644 --- a/code/ecp/crypto/Makefile +++ b/code/ecp/crypto/Makefile @@ -16,12 +16,12 @@ subdirs = compat curve25519 chacha poly1305 sha arc4random all: $(obj) for i in $(subdirs); do \ - (cd $$i && $(MAKE) && cd ..) || exit; \ + (cd $$i && $(MAKE)) || exit; \ done $(AR) rcs libecpcr.a $(obj) $(obj_dep) clean: for i in $(subdirs) test; do \ - (cd $$i && $(MAKE) clean && cd ..) || exit; \ + (cd $$i && $(MAKE) clean) || exit; \ done rm -f *.o *.a diff --git a/code/fe310/Makefile b/code/fe310/Makefile index 2f2abae..e37f235 100644 --- a/code/fe310/Makefile +++ b/code/fe310/Makefile @@ -2,7 +2,7 @@ include common.mk CFLAGS += -I./include -subdirs = drivers gloss metal eos eos/eve +subdirs = drivers gloss metal eos eos/eve eos/eve/widget all: libeos.a @@ -11,7 +11,7 @@ all: libeos.a libeos.a: for i in $(subdirs); do \ - (cd $$i && $(MAKE) && cd ..) || exit; \ + (cd $$i && $(MAKE)) || exit; \ done rm -f $@ for i in $(subdirs); do \ @@ -20,6 +20,6 @@ libeos.a: clean: for i in $(subdirs); do \ - (cd $$i && $(MAKE) clean && cd ..) || exit; \ + (cd $$i && $(MAKE) clean) || exit; \ done rm -f *.o *.a diff --git a/code/fe310/eos/eve/eve_kbd.c b/code/fe310/eos/eve/eve_kbd.c index f42b376..73bd9c9 100644 --- a/code/fe310/eos/eve/eve_kbd.c +++ b/code/fe310/eos/eve/eve_kbd.c @@ -9,14 +9,14 @@ #define KEY_CTRL 0x12 #define KEY_FN 0x13 -#define KEY_DEL 0x08 -#define KEY_RET 0x0a - #define KEYS_Y 575 #define KEYS_FSIZE 29 #define KEYS_HEIGHT 40 #define KEYS_RSIZE 45 +#define KEY_BS 0x08 +#define KEY_RET 0x0a + void eve_kbd_init(EVEKbd *kbd, eve_kbd_input_handler_t putc, uint32_t mem_addr, uint32_t *mem_next) { uint16_t mem_size; @@ -106,8 +106,8 @@ uint8_t eve_kbd_draw(EVEKbd *kbd, char active) { eve_cmd(CMD_KEYS, "hhhhhhs", 72, KEYS_Y + KEYS_RSIZE * 3, 335, KEYS_HEIGHT, KEYS_FSIZE, kbd->key_down, kbd->key_modifier & FLAG_FN ? " ,.<>/?" : kbd->key_modifier & (FLAG_SHIFT | FLAG_CTRL) ? "ZXCVBNM" : "zxcvbnm"); eve_cmd_dl(TAG(KEY_SHIFT)); eve_cmd(CMD_BUTTON, "hhhhhhs", 0, KEYS_Y + KEYS_RSIZE * 3, 69, KEYS_HEIGHT, 21, kbd->key_modifier & FLAG_SHIFT ? EVE_OPT_FLAT : 0, "shift"); - eve_cmd_dl(TAG(KEY_DEL)); - eve_cmd(CMD_BUTTON, "hhhhhhs", 410, KEYS_Y + KEYS_RSIZE * 3, 70, KEYS_HEIGHT, 21, kbd->key_down == KEY_DEL ? EVE_OPT_FLAT : 0, "del"); + eve_cmd_dl(TAG(KEY_BS)); + eve_cmd(CMD_BUTTON, "hhhhhhs", 410, KEYS_Y + KEYS_RSIZE * 3, 70, KEYS_HEIGHT, 21, kbd->key_down == KEY_BS ? EVE_OPT_FLAT : 0, "del"); eve_cmd_dl(TAG(KEY_FN)); eve_cmd(CMD_BUTTON, "hhhhhhs", 0, KEYS_Y + KEYS_RSIZE * 4, 69, KEYS_HEIGHT, 21, kbd->key_modifier & FLAG_FN ? EVE_OPT_FLAT : 0, "fn"); eve_cmd_dl(TAG(KEY_CTRL)); |