reorganize egg structure

justinmeiners · Dec 24, 2019 · 3574d73 · 3574d73
1 parent 99728ab
commit 3574d73
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,8 @@
 temp/
+*.so
+*.o
+
+termbox.build.sh
+termbox.import.scm
+termbox.install.sh
+termbox.link
diff --git a/Makefile b/Makefile
@@ -1,18 +1,18 @@
 # This is not for building the egg, but for pulling
 # the latest termbox source in.
 
-termbox.h: temp/
-	cp temp/src/*.c ./
-	cp temp/src/*.h ./
-	cp temp/src/*.inl ./
-	cp temp/COPYING COPYING.termbox
+termbox/: temp/
+	mkdir -p termbox
+	cp temp/src/*.c ./termbox/
+	cp temp/src/*.h ./termbox/
+	cp temp/src/*.inl ./termbox/
+	cp temp/COPYING ./termbox/COPYING
 
 temp/:
 	git clone [email protected]:nsf/termbox.git temp
 
 clean:
-	rm -rf temp/
-	rm -f *.c *.h *.inl
-	rm -f COPYING.termbox
+	rm -rf temp
+	rm -rf termbox
 
 .PHONY: clean, all
diff --git a/termbox.egg b/termbox.egg
@@ -4,5 +4,5 @@
  (category ui)
  (platform unix)
  (components
-    (extension termbox
-        (source  "termbox.scm"))))
+    (extension termbox)
+        (source "termbox.scm")))
diff --git a/termbox.scm b/termbox.scm
@@ -1,7 +1,13 @@
-(import (chicken foreign))
-(import srfi-4)
+(module termbox
+    *
+    (import (chicken foreign))
+    (import srfi-4))
+
+
+(foreign-declare "#include \"termbox/termbox.h\"")
+(foreign-declare "#include \"termbox/termbox.c\"")
+(foreign-declare "#include \"termbox/utf8.c\"")
 
-(foreign-declare "#include \"termbox.h\"")
 
 (define TB_DEFAULT (foreign-value "TB_DEFAULT" unsigned-integer32))
 (define TB_BLACK (foreign-value "TB_BLACK" unsigned-integer32))

diff --git a/COPYING.termbox → termbox/COPYING b/COPYING.termbox → termbox/COPYING
diff --git a/bytebuffer.inl → termbox/bytebuffer.inl b/bytebuffer.inl → termbox/bytebuffer.inl
diff --git a/input.inl → termbox/input.inl b/input.inl → termbox/input.inl
diff --git a/term.inl → termbox/term.inl b/term.inl → termbox/term.inl
diff --git a/termbox.c → termbox/termbox.c b/termbox.c → termbox/termbox.c
diff --git a/termbox.h → termbox/termbox.h b/termbox.h → termbox/termbox.h
diff --git a/utf8.c → termbox/utf8.c b/utf8.c → termbox/utf8.c
diff --git a/tests/test.scm b/tests/test.scm
@@ -1,3 +1,5 @@
+(import srfi-4)
+
 (import termbox)
 
 (termbox-init)