Remove unnecessary "unix" directory (#2)

scala-cli · Apr 14, 2022 · b286465 · b286465
1 parent c687356
commit b286465
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.../c/unix/libsodiumjni_internal_SodiumApi.c → .../main/c/libsodiumjni_internal_SodiumApi.c b/.../c/unix/libsodiumjni_internal_SodiumApi.c → .../main/c/libsodiumjni_internal_SodiumApi.c
diff --git a/.../c/unix/libsodiumjni_internal_SodiumApi.h → .../main/c/libsodiumjni_internal_SodiumApi.h b/.../c/unix/libsodiumjni_internal_SodiumApi.h → .../main/c/libsodiumjni_internal_SodiumApi.h
diff --git a/settings.sc b/settings.sc
@@ -9,8 +9,7 @@ import scala.util.Properties
 
 trait GenerateHeaders extends JavaModule {
  def cDirectory = T {
- val osDir = if (Properties.isWin) "win32" else "unix"
- millSourcePath / "src" / "main" / "c" / osDir
+ millSourcePath / "src" / "main" / "c"
  }
  def javacOptions = T {
  val dest = cDirectory()
@@ -323,7 +322,7 @@ trait JniUnixModule extends Module {
  def unixLibName: T[String]
 
  def unixCSources = T.sources {
- val mainDir = millSourcePath / "src" / "main" / "c" / "unix"
+ val mainDir = millSourcePath / "src" / "main" / "c"
  val isEmpty = !os.isDir(mainDir) || os.walk.stream(mainDir).filter(
  _.last.endsWith(".c")
  ).filter(os.isFile(_)).headOption.isEmpty