Merge branch 'declare-cc'

3 files changed, 30 insertions, 23 deletions

diff --git a/bundle/build.janet b/bundle/build.janet
index f24bb6e..1f2f91d 100644
--- a/bundle/build.janet
+++ b/bundle/build.janet
@@ -24,6 +24,11 @@
       :msvc cc/msvc-compile-and-link-shared
       cc/compile-and-link-shared))
 
+  (def compile-c
+    (case toolchain
+      :msvc cc/msvc-compile-c
+      :msvc cc/compile-c))
+
   (def static-cc
     (case toolchain
       :msvc cc/msvc-compile-and-make-archive
diff --git a/bundle/init-backup.janet b/bundle/init-backup.janet
new file mode 100644
index 0000000..03bb8ed
--- /dev/null
+++ b/bundle/init-backup.janet
@@ -0,0 +1,23 @@
+(import ./test)
+(import ./build :as b)
+(import ./clean :as c)
+
+(defn clean [&]
+  (c/main))
+
+(defn check [&]
+  (test/main))
+
+(defn build [&]
+  (b/main))
+
+(defn install [m &]
+  (bundle/add-file m "src/tarray.h" "tarray.h")
+  (bundle/add m "spork")
+  (compwhen (dyn 'bundle/add-bin)
+    (bundle/add-bin m "bin/janet-format")
+    (bundle/add-bin m "bin/janet-netrepl"))
+  (each file (os/dir "build/spork")
+    (def f (string "build/spork/" file))
+    (when (= (os/stat f :mode) :file)
+      (bundle/add-file m f (string "spork/" file)))))
diff --git a/bundle/init.janet b/bundle/init.janet
index 03bb8ed..0a14e1d 100644
--- a/bundle/init.janet
+++ b/bundle/init.janet
@@ -1,23 +1,2 @@
-(import ./test)
-(import ./build :as b)
-(import ./clean :as c)
-
-(defn clean [&]
-  (c/main))
-
-(defn check [&]
-  (test/main))
-
-(defn build [&]
-  (b/main))
-
-(defn install [m &]
-  (bundle/add-file m "src/tarray.h" "tarray.h")
-  (bundle/add m "spork")
-  (compwhen (dyn 'bundle/add-bin)
-    (bundle/add-bin m "bin/janet-format")
-    (bundle/add-bin m "bin/janet-netrepl"))
-  (each file (os/dir "build/spork")
-    (def f (string "build/spork/" file))
-    (when (= (os/stat f :mode) :file)
-      (bundle/add-file m f (string "spork/" file)))))
+(use /spork/declare-cc)
+(dofile "project.janet" :env (jpm-shim-env))