Merge branch 'master' into front_end_dependency

1 files changed, 13 insertions, 2 deletions

diff --git a/build.sbt b/build.sbt
index 284a9621..900cb5c6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -79,17 +79,28 @@ lazy val chiselSettings = Seq (
   //  }
 )
 
-lazy val chiselFrontend = (project in file("chiselFrontend")).
+lazy val coreMacros = (project in file("coreMacros")).
   settings(commonSettings: _*).
   settings(
     libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
   )
 
+lazy val chiselFrontend = (project in file("chiselFrontend")).
+  settings(commonSettings: _*).
+  settings(
+    libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
+  ).
+  dependsOn(coreMacros)
+
 lazy val chisel = (project in file(".")).
   settings(commonSettings: _*).
   settings(chiselSettings: _*).
-  dependsOn(chiselFrontend).settings(
+  dependsOn(coreMacros).
+  dependsOn(chiselFrontend).
+  settings(
     // Include macro classes, resources, and sources main jar.
+    mappings in (Compile, packageBin) <++= mappings in (coreMacros, Compile, packageBin),
+    mappings in (Compile, packageSrc) <++= mappings in (coreMacros, Compile, packageSrc),
     mappings in (Compile, packageBin) <++= mappings in (chiselFrontend, Compile, packageBin),
     mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc)
   )