2 files changed, 11 insertions, 2 deletions
diff --git a/nomsu.lua b/nomsu.lua
index 2b7f5a6..dc5b97f 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -1,6 +1,10 @@
+local clibtype = package.cpath:match("?%.(so)") or package.cpath:match("?%.(dll)")
+if clibtype == "dll" then
+  os.execute("chcp 65001>nul")
+end
 if NOMSU_VERSION and NOMSU_PREFIX then
   package.path = tostring(NOMSU_PREFIX) .. "/share/nomsu/" .. tostring(NOMSU_VERSION) .. "/?.lua;" .. package.path
-  package.cpath = tostring(NOMSU_PREFIX) .. "/lib/nomsu/" .. tostring(NOMSU_VERSION) .. "/?.so;" .. package.cpath
+  package.cpath = tostring(NOMSU_PREFIX) .. "/lib/nomsu/" .. tostring(NOMSU_VERSION) .. "/?." .. tostring(clibtype) .. ";" .. package.cpath
 end
 local EXIT_SUCCESS, EXIT_FAILURE = 0, 1
 if _VERSION == "Lua 5.1" and not jit then
diff --git a/nomsu.moon b/nomsu.moon
index 972be7f..240d457 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -1,9 +1,14 @@
 #!/usr/bin/env moon
 -- This file contains the command-line Nomsu runner.
 
+clibtype = package.cpath\match("?%.(so)") or package.cpath\match("?%.(dll)")
+if clibtype == "dll"
+    -- Special hack to enable utf8 for windows console applications:
+    os.execute("chcp 65001>nul")
+
 if NOMSU_VERSION and NOMSU_PREFIX
     package.path = "#{NOMSU_PREFIX}/share/nomsu/#{NOMSU_VERSION}/?.lua;"..package.path
-    package.cpath = "#{NOMSU_PREFIX}/lib/nomsu/#{NOMSU_VERSION}/?.so;"..package.cpath
+    package.cpath = "#{NOMSU_PREFIX}/lib/nomsu/#{NOMSU_VERSION}/?.#{clibtype};"..package.cpath
 
 EXIT_SUCCESS, EXIT_FAILURE = 0, 1