summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJed Barber <jjbarber@y7mail.com>2017-01-08 22:46:29 +1100
committerJed Barber <jjbarber@y7mail.com>2017-01-08 22:46:29 +1100
commit1652e49e17e4f4dead4bd23694a2b99a06048023 (patch)
tree1fed8349ae18b5b61946195ae9cf48fbda0f9a05
parent6824f93b9b575622cd13aefa81b800eb56ce0e2f (diff)
Moved nonworking code to the side
-rw-r--r--makefile22
-rw-r--r--src/Storage.hs.old (renamed from src/Storage.hs)0
-rw-r--r--src/preference_arrays.adb.old (renamed from src/preference_arrays.adb)0
-rw-r--r--src/preference_arrays.ads.old (renamed from src/preference_arrays.ads)0
-rw-r--r--src/testmain.hs.old (renamed from src/testmain.hs)0
5 files changed, 14 insertions, 8 deletions
diff --git a/makefile b/makefile
index cb953a2..04001c7 100644
--- a/makefile
+++ b/makefile
@@ -1,18 +1,24 @@
-all: testmain
+all: main
-testmain: ada_array
- ghc --make src/testmain.hs -isrc:build -odir build -outputdir build \
- -hidir build -stubdir build -dumpdir build -o bin/testmain build/ada_array.o
+main:
+ ghc --make src/main.hs -isrc:build -odir build -outputdir build \
+ -hidir build -stubdir build -dumpdir build -o bin/counter
-ada_array:
- gnatmake -Isrc -D build -c preference_arrays
- gnatbind -n build/preference_arrays
- gnatlink -r -nostdlib -o build/ada_array.o build/preference_arrays.ali
+#testmain: ada_array
+# ghc --make src/testmain.hs -isrc:build -odir build -outputdir build \
+# -hidir build -stubdir build -dumpdir build -o bin/testmain build/ada_array.o
+
+
+
+#ada_array:
+# gnatmake -Isrc -D build -c preference_arrays
+# gnatbind -n build/preference_arrays
+# gnatlink -r -nostdlib -o build/ada_array.o build/preference_arrays.ali
diff --git a/src/Storage.hs b/src/Storage.hs.old
index 2697c39..2697c39 100644
--- a/src/Storage.hs
+++ b/src/Storage.hs.old
diff --git a/src/preference_arrays.adb b/src/preference_arrays.adb.old
index 0b1218a..0b1218a 100644
--- a/src/preference_arrays.adb
+++ b/src/preference_arrays.adb.old
diff --git a/src/preference_arrays.ads b/src/preference_arrays.ads.old
index c8245e0..c8245e0 100644
--- a/src/preference_arrays.ads
+++ b/src/preference_arrays.ads.old
diff --git a/src/testmain.hs b/src/testmain.hs.old
index 3f340c2..3f340c2 100644
--- a/src/testmain.hs
+++ b/src/testmain.hs.old