Dariaceli's Git
Browse code

Fix linking order in makefile

Dario Rodriguez authored on 25/09/2023 14:19:45
Showing 1 changed files
Makefile
History View file @ 8fbfd06
... ... 
@@ -63,7 +63,7 @@ socklib.o: ext/socklib.c ext/socklib.h
63 63 
 	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
64 64
65 65 
 re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o prototypes_tcl.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
66 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o prototypes_tcl.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
66 
+	$(CC) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o prototypes_tcl.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o $(LDFLAGS)
67 67
68 68 
 tests: re_tests.o re_data.o sha3.o
69 69 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
... ... 
@@ -71,5 +71,11 @@ tests: re_tests.o re_data.o sha3.o
71 71 
 tests_utf8: re_tests_utf8.o re_data.o sha3.o
72 72 
 	$(CC) $(LDFLAGS) -o tests_utf8 re_tests_utf8.o re_data.o sha3.o
73 73
74 
+re32: recenteditor.c re_data.c re_plugin_unsaved.c re_plugin_highlighter.c re_plugin_prototypes.c prototypes_c89_posix.c prototypes_tcl.c sha3/sha3.c re_ui.c hack_regular.c iosevka_fixed_regular.c ../webkernel/src/socklib.c
75 
+	sh -c ". /shared/Devel/toolchains/zig/env.sh ; zig cc -target x86-linux-musl -I/shared/Devel/toolchains/alpine/alpine-i386/usr/include/ -I/shared/Devel/toolchains/alpine/alpine-i386/usr/include/SDL2/ -L/shared/Devel/toolchains/alpine/alpine-i386/usr/lib recenteditor.c re_data.c re_plugin_unsaved.c re_plugin_highlighter.c re_plugin_prototypes.c prototypes_c89_posix.c prototypes_tcl.c -Isha3 sha3/sha3.c re_ui.c hack_regular.c iosevka_fixed_regular.c -I../webkernel/src/ ../webkernel/src/socklib.c -lSDL2 -lSDL2_ttf -o re32"
76 
+
77 
+re64: recenteditor.c re_data.c re_plugin_unsaved.c re_plugin_highlighter.c re_plugin_prototypes.c prototypes_c89_posix.c prototypes_tcl.c sha3/sha3.c re_ui.c hack_regular.c iosevka_fixed_regular.c ../webkernel/src/socklib.c
78 
+	sh -c ". /shared/Devel/toolchains/zig/env.sh ; zig cc -target x86_64-linux-gnu -I/usr/include/ -I/usr/include/SDL2/ -L/usr/lib/x86_64-linux-gnu/ recenteditor.c re_data.c re_plugin_unsaved.c re_plugin_highlighter.c re_plugin_prototypes.c prototypes_c89_posix.c prototypes_tcl.c -Isha3 sha3/sha3.c re_ui.c hack_regular.c iosevka_fixed_regular.c -I../webkernel/src/ ../webkernel/src/socklib.c -lSDL2 -lSDL2_ttf -lfreetype -lpng -lz -lsndio -lasound -lpulse -lwayland-client -lxkbcommon -lwayland-cursor -lwayland-egl -lXrandr -lXxf86vm -lXss -lXi -lXinerama -lXext -lX11 -lX11-xcb -lxcb -lXcursor -lXau -lXdmcp -lXrender -lXfixes -o re64"
79 
+
74 80 
 clean:
75 81 
 	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o iosevka_fixed_regular.c iosevka_fixed_regular.h iosevka_fixed_regular.o prototypes_c89_posix.o prototypes_tcl.o re tests
Browse code

add tcl language support for the hinter (uses tcl hinter instead of C hinter if first line starts with # and has tclsh, wish or expect)

Dario Rodriguez authored on 21/02/2022 19:05:43
Showing 1 changed files
Makefile
History View file @ 132c048
... ... 
@@ -50,11 +50,20 @@ prototypes_c89_posix.h: prototypes_c89_posix.txt
50 50 
 prototypes_c89_posix.o: prototypes_c89_posix.c
51 51 
 	$(CC) $(CFLAGS) -c -o prototypes_c89_posix.o prototypes_c89_posix.c
52 52
53 
+prototypes_tcl.c: prototypes_tcl.txt
54 
+	./prototypes2h.sh prototypes_tcl.txt
55 
+
56 
+prototypes_tcl.h: prototypes_tcl.txt
57 
+	./prototypes2h.sh prototypes_tcl.txt
58 
+
59 
+prototypes_tcl.o: prototypes_tcl.c
60 
+	$(CC) $(CFLAGS) -c -o prototypes_tcl.o prototypes_tcl.c
61 
+
53 62 
 socklib.o: ext/socklib.c ext/socklib.h
54 63 
 	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
55 64
56 
-re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
57 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
65 
+re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o prototypes_tcl.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
66 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o prototypes_tcl.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
58 67
59 68 
 tests: re_tests.o re_data.o sha3.o
60 69 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
... ... 
@@ -63,4 +72,4 @@ tests_utf8: re_tests_utf8.o re_data.o sha3.o
63 72 
 	$(CC) $(LDFLAGS) -o tests_utf8 re_tests_utf8.o re_data.o sha3.o
64 73
65 74 
 clean:
66 
-	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o iosevka_fixed_regular.c iosevka_fixed_regular.h iosevka_fixed_regular.o re tests
75 
+	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o iosevka_fixed_regular.c iosevka_fixed_regular.h iosevka_fixed_regular.o prototypes_c89_posix.o prototypes_tcl.o re tests
Browse code

Add font iosevka-fixed-regular for Control+P printouts

Dario Rodriguez authored on 19/01/2021 18:53:05
Showing 1 changed files
Makefile
History View file @ b1ecd81
... ... 
@@ -14,7 +14,7 @@ re_plugin_highlighter.o: re_plugin_highlighter.c re_plugin_highlighter.h re_data
14 14
15 15 
 re_plugin_prototypes.o: re_plugin_prototypes.c re_plugin_prototypes.h prototypes_c89_posix.h
16 16
17 
-re_ui.o: re_ui.c re_ui.h hack_regular.h
17 
+re_ui.o: re_ui.c re_ui.h hack_regular.h iosevka_fixed_regular.h
18 18
19 19 
 re_tests.o: re_tests.c re_data.h
20 20
... ... 
@@ -32,6 +32,15 @@ hack_regular.h: ttf/Hack-Regular.ttf
32 32 
 hack_regular.o: hack_regular.c
33 33 
 	$(CC) $(CFLAGS) -c -o hack_regular.o hack_regular.c
34 34
35 
+iosevka_fixed_regular.c: ttf/iosevka-fixed-regular.ttf
36 
+	./ttf2h.sh ttf/iosevka-fixed-regular.ttf
37 
+
38 
+iosevka_fixed_regular.h: ttf/iosevka-fixed-regular.ttf
39 
+	./ttf2h.sh ttf/iosevka-fixed-regular.ttf
40 
+
41 
+iosevka_fixed_regular.o: iosevka_fixed_regular.c
42 
+	$(CC) $(CFLAGS) -c -o iosevka_fixed_regular.o iosevka_fixed_regular.c
43 
+
35 44 
 prototypes_c89_posix.c: prototypes_c89_posix.txt
36 45 
 	./prototypes2h.sh prototypes_c89_posix.txt
37 46
... ... 
@@ -44,8 +53,8 @@ prototypes_c89_posix.o: prototypes_c89_posix.c
44 53 
 socklib.o: ext/socklib.c ext/socklib.h
45 54 
 	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
46 55
47 
-re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
48 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
56 
+re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
57 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o iosevka_fixed_regular.o socklib.o
49 58
50 59 
 tests: re_tests.o re_data.o sha3.o
51 60 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
... ... 
@@ -54,4 +63,4 @@ tests_utf8: re_tests_utf8.o re_data.o sha3.o
54 63 
 	$(CC) $(LDFLAGS) -o tests_utf8 re_tests_utf8.o re_data.o sha3.o
55 64
56 65 
 clean:
57 
-	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o saxmono.c saxmono.h saxmono.o re tests
66 
+	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o iosevka_fixed_regular.c iosevka_fixed_regular.h iosevka_fixed_regular.o re tests
Browse code

Remove saxmono font as it doesn't look good for small font sizes

Dario Rodriguez authored on 18/01/2021 15:51:41
Showing 1 changed files
Makefile
History View file @ 4f474cd
... ... 
@@ -14,7 +14,7 @@ re_plugin_highlighter.o: re_plugin_highlighter.c re_plugin_highlighter.h re_data
14 14
15 15 
 re_plugin_prototypes.o: re_plugin_prototypes.c re_plugin_prototypes.h prototypes_c89_posix.h
16 16
17 
-re_ui.o: re_ui.c re_ui.h hack_regular.h saxmono.h
17 
+re_ui.o: re_ui.c re_ui.h hack_regular.h
18 18
19 19 
 re_tests.o: re_tests.c re_data.h
20 20
... ... 
@@ -32,15 +32,6 @@ hack_regular.h: ttf/Hack-Regular.ttf
32 32 
 hack_regular.o: hack_regular.c
33 33 
 	$(CC) $(CFLAGS) -c -o hack_regular.o hack_regular.c
34 34
35 
-saxmono.c: ttf/saxmono.ttf
36 
-	./ttf2h.sh ttf/saxmono.ttf
37 
-
38 
-saxmono.h: ttf/saxmono.ttf
39 
-	./ttf2h.sh ttf/saxmono.ttf
40 
-
41 
-saxmono.o: saxmono.c
42 
-	$(CC) $(CFLAGS) -c -o saxmono.o saxmono.c
43 
-
44 35 
 prototypes_c89_posix.c: prototypes_c89_posix.txt
45 36 
 	./prototypes2h.sh prototypes_c89_posix.txt
46 37
... ... 
@@ -53,8 +44,8 @@ prototypes_c89_posix.o: prototypes_c89_posix.c
53 44 
 socklib.o: ext/socklib.c ext/socklib.h
54 45 
 	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
55 46
56 
-re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o saxmono.o socklib.o
57 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o saxmono.o socklib.o
47 
+re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
48 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
58 49
59 50 
 tests: re_tests.o re_data.o sha3.o
60 51 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
Browse code

Add saxmono font

Dario Rodriguez authored on 15/01/2021 22:13:40
Showing 1 changed files
Makefile
History View file @ 9d7c6b5
... ... 
@@ -14,7 +14,7 @@ re_plugin_highlighter.o: re_plugin_highlighter.c re_plugin_highlighter.h re_data
14 14
15 15 
 re_plugin_prototypes.o: re_plugin_prototypes.c re_plugin_prototypes.h prototypes_c89_posix.h
16 16
17 
-re_ui.o: re_ui.c re_ui.h hack_regular.h
17 
+re_ui.o: re_ui.c re_ui.h hack_regular.h saxmono.h
18 18
19 19 
 re_tests.o: re_tests.c re_data.h
20 20
... ... 
@@ -32,6 +32,15 @@ hack_regular.h: ttf/Hack-Regular.ttf
32 32 
 hack_regular.o: hack_regular.c
33 33 
 	$(CC) $(CFLAGS) -c -o hack_regular.o hack_regular.c
34 34
35 
+saxmono.c: ttf/saxmono.ttf
36 
+	./ttf2h.sh ttf/saxmono.ttf
37 
+
38 
+saxmono.h: ttf/saxmono.ttf
39 
+	./ttf2h.sh ttf/saxmono.ttf
40 
+
41 
+saxmono.o: saxmono.c
42 
+	$(CC) $(CFLAGS) -c -o saxmono.o saxmono.c
43 
+
35 44 
 prototypes_c89_posix.c: prototypes_c89_posix.txt
36 45 
 	./prototypes2h.sh prototypes_c89_posix.txt
37 46
... ... 
@@ -44,8 +53,8 @@ prototypes_c89_posix.o: prototypes_c89_posix.c
44 53 
 socklib.o: ext/socklib.c ext/socklib.h
45 54 
 	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
46 55
47 
-re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
48 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
56 
+re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o saxmono.o socklib.o
57 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o saxmono.o socklib.o
49 58
50 59 
 tests: re_tests.o re_data.o sha3.o
51 60 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
... ... 
@@ -54,4 +63,4 @@ tests_utf8: re_tests_utf8.o re_data.o sha3.o
54 63 
 	$(CC) $(LDFLAGS) -o tests_utf8 re_tests_utf8.o re_data.o sha3.o
55 64
56 65 
 clean:
57 
-	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o re tests
66 
+	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o saxmono.c saxmono.h saxmono.o re tests
Browse code

Implement show hint of related prototype (for now only for common C/POSIX functions)

Dario Rodriguez authored on 31/10/2020 21:29:27
Showing 1 changed files
Makefile
History View file @ b0e8202
... ... 
@@ -12,6 +12,8 @@ re_plugin_unsaved.o: re_plugin_unsaved.c re_plugin_unsaved.h re_data.h
12 12
13 13 
 re_plugin_highlighter.o: re_plugin_highlighter.c re_plugin_highlighter.h re_data.h
14 14
15 
+re_plugin_prototypes.o: re_plugin_prototypes.c re_plugin_prototypes.h prototypes_c89_posix.h
16 
+
15 17 
 re_ui.o: re_ui.c re_ui.h hack_regular.h
16 18
17 19 
 re_tests.o: re_tests.c re_data.h
... ... 
@@ -30,11 +32,20 @@ hack_regular.h: ttf/Hack-Regular.ttf
30 32 
 hack_regular.o: hack_regular.c
31 33 
 	$(CC) $(CFLAGS) -c -o hack_regular.o hack_regular.c
32 34
35 
+prototypes_c89_posix.c: prototypes_c89_posix.txt
36 
+	./prototypes2h.sh prototypes_c89_posix.txt
37 
+
38 
+prototypes_c89_posix.h: prototypes_c89_posix.txt
39 
+	./prototypes2h.sh prototypes_c89_posix.txt
40 
+
41 
+prototypes_c89_posix.o: prototypes_c89_posix.c
42 
+	$(CC) $(CFLAGS) -c -o prototypes_c89_posix.o prototypes_c89_posix.c
43 
+
33 44 
 socklib.o: ext/socklib.c ext/socklib.h
34 45 
 	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
35 46
36 
-re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.o socklib.o
37 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.o socklib.o
47 
+re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
48 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o re_plugin_prototypes.o prototypes_c89_posix.o sha3.o re_ui.o hack_regular.o socklib.o
38 49
39 50 
 tests: re_tests.o re_data.o sha3.o
40 51 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
Browse code

Add highlighter plugin structs and registration

Dario Rodriguez authored on 12/10/2020 21:55:42
Showing 1 changed files
Makefile
History View file @ b59e7bd
... ... 
@@ -10,6 +10,8 @@ re_data.o: re_data.c re_data.h
10 10
11 11 
 re_plugin_unsaved.o: re_plugin_unsaved.c re_plugin_unsaved.h re_data.h
12 12
13 
+re_plugin_highlighter.o: re_plugin_highlighter.c re_plugin_highlighter.h re_data.h
14 
+
13 15 
 re_ui.o: re_ui.c re_ui.h hack_regular.h
14 16
15 17 
 re_tests.o: re_tests.c re_data.h
... ... 
@@ -31,8 +33,8 @@ hack_regular.o: hack_regular.c
31 33 
 socklib.o: ext/socklib.c ext/socklib.h
32 34 
 	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
33 35
34 
-re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.o socklib.o
35 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.o socklib.o
36 
+re: recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.o socklib.o
37 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.o socklib.o
36 38
37 39 
 tests: re_tests.o re_data.o sha3.o
38 40 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
... ... 
@@ -41,4 +43,4 @@ tests_utf8: re_tests_utf8.o re_data.o sha3.o
41 43 
 	$(CC) $(LDFLAGS) -o tests_utf8 re_tests_utf8.o re_data.o sha3.o
42 44
43 45 
 clean:
44 
-	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o re tests
46 
+	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o re_plugin_highlighter.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o re tests
Browse code

Move utf8 helper functions to re_data. Add redata_op_addn().

Dario Rodriguez authored on 02/09/2020 22:07:13
Showing 1 changed files
Makefile
History View file @ a2a0ad8
... ... 
@@ -2,7 +2,7 @@ CC=gcc
2 2 
 CFLAGS=-g -Wall -Wformat-truncation=0 -Ideps -I/usr/include/SDL2
3 3 
 LDFLAGS=-lSDL2 -lSDL2_image -lSDL2_ttf
4 4
5 
-all: re tests tests_ui
5 
+all: re tests tests_utf8
6 6
7 7 
 recenteditor.o: recenteditor.c re_data.h ext/socklib.h
8 8
... ... 
@@ -14,7 +14,7 @@ re_ui.o: re_ui.c re_ui.h hack_regular.h
14 14
15 15 
 re_tests.o: re_tests.c re_data.h
16 16
17 
-re_tests_ui.o: re_tests_ui.c re_ui.h
17 
+re_tests_utf8.o: re_tests_utf8.c re_ui.h
18 18
19 19 
 sha3.o: sha3/sha3.c sha3/sha3.h
20 20 
 	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
... ... 
@@ -37,8 +37,8 @@ re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.o s
37 37 
 tests: re_tests.o re_data.o sha3.o
38 38 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
39 39
40 
-tests_ui: re_tests_ui.o re_ui.o hack_regular.o
41 
-	$(CC) $(LDFLAGS) -o tests_ui re_tests_ui.o re_ui.o hack_regular.o
40 
+tests_utf8: re_tests_utf8.o re_data.o sha3.o
41 
+	$(CC) $(LDFLAGS) -o tests_utf8 re_tests_utf8.o re_data.o sha3.o
42 42
43 43 
 clean:
44 44 
 	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o re tests
Browse code

Implement left/right movement. Add test_ui with utf8 tests.

Dario Rodriguez authored on 30/08/2020 21:47:55
Showing 1 changed files
Makefile
History View file @ a1edb4c
... ... 
@@ -2,7 +2,7 @@ CC=gcc
2 2 
 CFLAGS=-g -Wall -Wformat-truncation=0 -Ideps -I/usr/include/SDL2
3 3 
 LDFLAGS=-lSDL2 -lSDL2_image -lSDL2_ttf
4 4
5 
-all: re tests
5 
+all: re tests tests_ui
6 6
7 7 
 recenteditor.o: recenteditor.c re_data.h ext/socklib.h
8 8
... ... 
@@ -14,6 +14,8 @@ re_ui.o: re_ui.c re_ui.h hack_regular.h
14 14
15 15 
 re_tests.o: re_tests.c re_data.h
16 16
17 
+re_tests_ui.o: re_tests_ui.c re_ui.h
18 
+
17 19 
 sha3.o: sha3/sha3.c sha3/sha3.h
18 20 
 	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
19 21
... ... 
@@ -35,5 +37,8 @@ re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.o s
35 37 
 tests: re_tests.o re_data.o sha3.o
36 38 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
37 39
40 
+tests_ui: re_tests_ui.o re_ui.o hack_regular.o
41 
+	$(CC) $(LDFLAGS) -o tests_ui re_tests_ui.o re_ui.o hack_regular.o
42 
+
38 43 
 clean:
39 44 
 	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o re tests
Browse code

Display first lines of the loaded file

Dario Rodriguez authored on 18/08/2020 20:31:28
Showing 1 changed files
Makefile
History View file @ 1366898
... ... 
@@ -1,27 +1,39 @@
1 1 
 CC=gcc
2 2 
 CFLAGS=-g -Wall -Wformat-truncation=0 -Ideps -I/usr/include/SDL2
3 
-LDFLAGS=-lSDL2 -lSDL2_image
3 
+LDFLAGS=-lSDL2 -lSDL2_image -lSDL2_ttf
4 4
5 5 
 all: re tests
6 6
7 
-recenteditor.o: recenteditor.c re_data.h
7 
+recenteditor.o: recenteditor.c re_data.h ext/socklib.h
8 8
9 9 
 re_data.o: re_data.c re_data.h
10 10
11 11 
 re_plugin_unsaved.o: re_plugin_unsaved.c re_plugin_unsaved.h re_data.h
12 12
13 
-re_ui.o: re_ui.c re_ui.h
13 
+re_ui.o: re_ui.c re_ui.h hack_regular.h
14 14
15 15 
 re_tests.o: re_tests.c re_data.h
16 16
17 17 
 sha3.o: sha3/sha3.c sha3/sha3.h
18 18 
 	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
19 19
20 
-re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o
21 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o
20 
+hack_regular.c: ttf/Hack-Regular.ttf
21 
+	./ttf2h.sh ttf/Hack-Regular.ttf
22 
+
23 
+hack_regular.h: ttf/Hack-Regular.ttf
24 
+	./ttf2h.sh ttf/Hack-Regular.ttf
25 
+
26 
+hack_regular.o: hack_regular.c
27 
+	$(CC) $(CFLAGS) -c -o hack_regular.o hack_regular.c
28 
+
29 
+socklib.o: ext/socklib.c ext/socklib.h
30 
+	$(CC) $(CFLAGS) -Iext -c -o socklib.o ext/socklib.c
31 
+
32 
+re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.o socklib.o
33 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.o socklib.o
22 34
23 35 
 tests: re_tests.o re_data.o sha3.o
24 36 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
25 37
26 38 
 clean:
27 
-	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re_ui.o re tests
39 
+	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re_ui.o hack_regular.c hack_regular.h hack_regular.o re tests
Browse code

Add re_ui.c stub, fix Makefile

Dario Rodriguez authored on 07/08/2020 21:30:22
Showing 1 changed files
Makefile
History View file @ 6f48520
... ... 
@@ -1,5 +1,5 @@
1 1 
 CC=gcc
2 
-CFLAGS=-g -Wall -Ideps -I/usr/include/SDL2
2 
+CFLAGS=-g -Wall -Wformat-truncation=0 -Ideps -I/usr/include/SDL2
3 3 
 LDFLAGS=-lSDL2 -lSDL2_image
4 4
5 5 
 all: re tests
... ... 
@@ -10,16 +10,18 @@ re_data.o: re_data.c re_data.h
10 10
11 11 
 re_plugin_unsaved.o: re_plugin_unsaved.c re_plugin_unsaved.h re_data.h
12 12
13 
+re_ui.o: re_ui.c re_ui.h
14 
+
13 15 
 re_tests.o: re_tests.c re_data.h
14 16
15 17 
 sha3.o: sha3/sha3.c sha3/sha3.h
16 18 
 	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
17 19
18 
-re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o
19 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o sha3.o
20 
+re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o
21 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o sha3.o re_ui.o
20 22
21 23 
 tests: re_tests.o re_data.o sha3.o
22 24 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
23 25
24 26 
 clean:
25 
-	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re tests
27 
+	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re_ui.o re tests
Browse code

Refactor unsaved into a plugin of redata

Dario Rodriguez authored on 04/04/2019 21:53:07
Showing 1 changed files
Makefile
History View file @ 692bf48
... ... 
@@ -8,16 +8,18 @@ recenteditor.o: recenteditor.c re_data.h
8 8
9 9 
 re_data.o: re_data.c re_data.h
10 10
11 
+re_plugin_unsaved.o: re_plugin_unsaved.c re_plugin_unsaved.h re_data.h
12 
+
11 13 
 re_tests.o: re_tests.c re_data.h
12 14
13 15 
 sha3.o: sha3/sha3.c sha3/sha3.h
14 16 
 	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
15 17
16 
-re: recenteditor.o re_data.o sha3.o
17 
-	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o sha3.o
18 
+re: recenteditor.o re_data.o re_plugin_unsaved.o sha3.o
19 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o re_plugin_unsaved.o sha3.o
18 20
19 21 
 tests: re_tests.o re_data.o sha3.o
20 22 
 	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
21 23
22 24 
 clean:
23 
-	rm -f recenteditor.o re_data.o re_tests.o sha3.o re tests
25 
+	rm -f recenteditor.o re_data.o re_tests.o re_plugin_unsaved.o sha3.o re tests
Browse code

renamed recenteditor_data to re_data, recenteditor_tests to re_tests

Dario Rodriguez authored on 01/04/2019 21:26:29
Showing 1 changed files
Makefile
History View file @ aa72865
... ... 
@@ -4,20 +4,20 @@ LDFLAGS=-lSDL2 -lSDL2_image
4 4
5 5 
 all: re tests
6 6
7 
-recenteditor.o: recenteditor.c recenteditor_data.h
7 
+recenteditor.o: recenteditor.c re_data.h
8 8
9 
-recenteditor_data.o: recenteditor_data.c recenteditor_data.h
9 
+re_data.o: re_data.c re_data.h
10 10
11 
-recenteditor_tests.o: recenteditor_tests.c recenteditor_data.h
11 
+re_tests.o: re_tests.c re_data.h
12 12
13 13 
 sha3.o: sha3/sha3.c sha3/sha3.h
14 14 
 	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
15 15
16 
-re: recenteditor.o recenteditor_data.o sha3.o
17 
-	$(CC) $(LDFLAGS) -o re recenteditor.o recenteditor_data.o sha3.o
16 
+re: recenteditor.o re_data.o sha3.o
17 
+	$(CC) $(LDFLAGS) -o re recenteditor.o re_data.o sha3.o
18 18
19 
-tests: recenteditor_tests.o recenteditor_data.o sha3.o
20 
-	$(CC) $(LDFLAGS) -o tests recenteditor_tests.o recenteditor_data.o sha3.o
19 
+tests: re_tests.o re_data.o sha3.o
20 
+	$(CC) $(LDFLAGS) -o tests re_tests.o re_data.o sha3.o
21 21
22 22 
 clean:
23 
-	rm -f recenteditor.o recenteditor_data.o sha3.o re
23 
+	rm -f recenteditor.o re_data.o re_tests.o sha3.o re tests
Browse code

Add undobuf structire and corresponding functions

Dario Rodriguez authored on 05/03/2019 21:40:51
Showing 1 changed files
Makefile
History View file @ 67f9982
... ... 
@@ -2,11 +2,13 @@ CC=gcc
2 2 
 CFLAGS=-g -Wall -Ideps -I/usr/include/SDL2
3 3 
 LDFLAGS=-lSDL2 -lSDL2_image
4 4
5 
-all: re
5 
+all: re tests
6 
+
7 
+recenteditor.o: recenteditor.c recenteditor_data.h
6 8
7 9 
 recenteditor_data.o: recenteditor_data.c recenteditor_data.h
8 10
9 
-recenteditor.o: recenteditor.c recenteditor_data.h
11 
+recenteditor_tests.o: recenteditor_tests.c recenteditor_data.h
10 12
11 13 
 sha3.o: sha3/sha3.c sha3/sha3.h
12 14 
 	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
... ... 
@@ -14,5 +16,8 @@ sha3.o: sha3/sha3.c sha3/sha3.h
14 16 
 re: recenteditor.o recenteditor_data.o sha3.o
15 17 
 	$(CC) $(LDFLAGS) -o re recenteditor.o recenteditor_data.o sha3.o
16 18
19 
+tests: recenteditor_tests.o recenteditor_data.o sha3.o
20 
+	$(CC) $(LDFLAGS) -o tests recenteditor_tests.o recenteditor_data.o sha3.o
21 
+
17 22 
 clean:
18 23 
 	rm -f recenteditor.o recenteditor_data.o sha3.o re
Browse code

Change sha3 implementation used. Initial unsaved data API.

Dario Rodriguez authored on 02/03/2019 16:12:12
Showing 1 changed files
Makefile
History View file @ e6ebc6a
... ... 
@@ -2,20 +2,17 @@ CC=gcc
2 2 
 CFLAGS=-g -Wall -Ideps -I/usr/include/SDL2
3 3 
 LDFLAGS=-lSDL2 -lSDL2_image
4 4
5 
-KECCAKOPTS=-Ikeccak -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DKeccakOpt=32
6 
-
7 5 
 all: re
8 6
9 7 
 recenteditor_data.o: recenteditor_data.c recenteditor_data.h
10 
-	$(CC) $(CFLAGS) $(KECCAKOPTS) -c -o recenteditor_data.o recenteditor_data.c
11 8
12 9 
 recenteditor.o: recenteditor.c recenteditor_data.h
13 10
14 
-keccak/keccak.a:
15 
-	sh -c "cd keccak && make keccak.a"
11 
+sha3.o: sha3/sha3.c sha3/sha3.h
12 
+	$(CC) $(CFLAGS) -Isha3 -c -o sha3.o sha3/sha3.c
16 13
17 
-re: recenteditor.o recenteditor_data.o keccak/keccak.a
18 
-	$(CC) $(LDFLAGS) -o re recenteditor.o recenteditor_data.o keccak/keccak.a
14 
+re: recenteditor.o recenteditor_data.o sha3.o
15 
+	$(CC) $(LDFLAGS) -o re recenteditor.o recenteditor_data.o sha3.o
19 16
20 17 
 clean:
21 
-	rm -f recenteditor.o recenteditor_data.o re
18 
+	rm -f recenteditor.o recenteditor_data.o sha3.o re
Browse code

start implementation of undo and unsaved in redata. tentative sha3-512 support for unsaved integrity check

Dario Rodriguez authored on 26/02/2019 21:26:05
Showing 1 changed files
Makefile
History View file @ 16296c5
... ... 
@@ -1,15 +1,21 @@
1 1 
 CC=gcc
2 
-CFLAGS=-g -Wall -I/usr/include/SDL2
2 
+CFLAGS=-g -Wall -Ideps -I/usr/include/SDL2
3 3 
 LDFLAGS=-lSDL2 -lSDL2_image
4 4
5 
+KECCAKOPTS=-Ikeccak -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DKeccakOpt=32
6 
+
5 7 
 all: re
6 8
7 9 
 recenteditor_data.o: recenteditor_data.c recenteditor_data.h
10 
+	$(CC) $(CFLAGS) $(KECCAKOPTS) -c -o recenteditor_data.o recenteditor_data.c
8 11
9 12 
 recenteditor.o: recenteditor.c recenteditor_data.h
10 13
11 
-re: recenteditor.o recenteditor_data.o
12 
-	$(CC) $(LDFLAGS) -o re recenteditor.o recenteditor_data.o
14 
+keccak/keccak.a:
15 
+	sh -c "cd keccak && make keccak.a"
16 
+
17 
+re: recenteditor.o recenteditor_data.o keccak/keccak.a
18 
+	$(CC) $(LDFLAGS) -o re recenteditor.o recenteditor_data.o keccak/keccak.a
13 19
14 20 
 clean:
15 21 
 	rm -f recenteditor.o recenteditor_data.o re
Browse code

data structures skeleton

Dario Rodriguez authored on 25/02/2019 22:04:09
Showing 1 changed files
Makefile
History View file @ 4b22f0f
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,15 @@
1 
+CC=gcc
2 
+CFLAGS=-g -Wall -I/usr/include/SDL2
3 
+LDFLAGS=-lSDL2 -lSDL2_image
4 
+
5 
+all: re
6 
+
7 
+recenteditor_data.o: recenteditor_data.c recenteditor_data.h
8 
+
9 
+recenteditor.o: recenteditor.c recenteditor_data.h
10 
+
11 
+re: recenteditor.o recenteditor_data.o
12 
+	$(CC) $(LDFLAGS) -o re recenteditor.o recenteditor_data.o
13 
+
14 
+clean:
15 
+	rm -f recenteditor.o recenteditor_data.o re