2 files changed, 17 insertions, 6 deletions

diff --git a/g b/g
index a48efef2..91cd3163 100755
--- a/g
+++ b/g
@@ -1,7 +1,7 @@
 #!/bin/bash
 warn="-freverse-errors -fwarn-unused-imports -Wmissing-signatures -fdefer-typed-holes"
 exts="-XOverloadedStrings -XRecordWildCards"
-defs="-DBENCODE_AESON -DTHREAD_DEBUG"
+defs="-DXMPP -DBENCODE_AESON -DTHREAD_DEBUG"
 hide="-hide-package crypto-random -hide-package crypto-api -hide-package crypto-numbers -hide-package cryptohash -hide-package prettyclass"
 
 root=${0%/*}
@@ -9,7 +9,7 @@ cd "$root"
 
 me=${0##*/}
 me=${me%.*}
-ghc                                  \
+ghc -threaded                        \
     $hide                            \
     $exts                            \
     $defs                            \
diff --git a/gi b/gi
index 8101348e..84dc9696 100755
--- a/gi
+++ b/gi
@@ -1,14 +1,25 @@
 #!/bin/bash
-args="-fwarn-unused-imports"
+warn="-freverse-errors -fwarn-unused-imports -Wmissing-signatures -fdefer-typed-holes"
+exts="-XOverloadedStrings -XRecordWildCards"
+defs="-DXMPP -DBENCODE_AESON -DTHREAD_DEBUG"
+hide="-hide-package crypto-random -hide-package crypto-api -hide-package crypto-numbers -hide-package cryptohash -hide-package prettyclass"
 
 root=${0%/*}
 cd "$root"
 
-me=g
-ghci                                 \
+me=${0##*/}
+me=${me%.*}
+ghci -fobject-code                   \
+    $hide                            \
+    $exts                            \
+    $defs                            \
     -hidir build/$me -odir build/$me \
     -iPresence                       \
     -iArchive                        \
+    -isrc                            \
+    -icryptonite-backport            \
     build/b/Presence/monitortty.o    \
-    $args                            \
+    build/b/cbits/cryptonite_salsa.o \
+    build/b/cbits/cryptonite_xsalsa.o\
+    $warn                            \
     "$@"