Rebuilt windows libmarkdown.a files; Updated cross-compilation

references.

Author: h3rald

doc/HastyScribe_UserGuide.htm

@@ -240,6 +240,7 @@ <h3 id="Downloading.Pre-built.Binaries">Downloading Pre-built Binaries<a href="#
 <ul>
 <li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.1.0/hastyscribe_v1.1.0_macosx_x64.zip">HastyScribe for Mac OS X (x64)</a> &ndash; Compiled on OS X Yosemite (LLVM CLANG 6.0)</li>
 <li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.1.0/hastyscribe_v1.1.0_windows_x64.zip">HastyScribe for Windows (x64)</a> &ndash; Cross-compiled on OS X Yosemite (MinGW-w64 GCC 4.8.2)</li>
+<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.1.0/hastyscribe_v1.1.0_windows_x86.zip">HastyScribe for Windows (x86)</a> &ndash; Cross-compiled on OS X Yosemite (MinGW-w64 GCC 4.8.2)</li>
 <li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.1.0/hastyscribe_v1.1.0_linux_x86.zip">HastyScribe for Linux (x86)</a> &ndash; Cross-compiled on OS X Yosemite (GNU GCC 4.8.1)</li>
 <li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.1.0/hastyscribe_v1.1.0_linux_arm.zip">HastyScribe for Linux (ARM)</a> &ndash; Cross-compiled on OS X Yosemite (GNU GCC 4.8.2)</li>
 </ul>
@@ -1125,7 +1126,7 @@ <h2 id="Credits">Credits<a href="#document-top" title="Go to top"></a></h2>
 <p>Special thanks to:</p>
 
 <ul>
-<li>Philip Wernersbach, for contributing to HastyScribe.</li>
+<li>Philip Wernersbach and Joshua Ellis, for contributing to HastyScribe.</li>
 <li>Andreas Rumpf, creator of the amazing <a href="http://nim-lang.org/">Nim</a> programming language, used to implement HastyScribe.</li>
 <li>Ethan Lai, developer of the handy <a href="http://koala-app.com/">Koala</a> app, used to compile all the LESS code into CSS.</li>
 </ul>

doc/HastyScribe_UserGuide.md

@@ -79,6 +79,7 @@ The easiest way to get {{hs}} is by downloading one of the prebuilt binaries fro
 
   * [HastyScribe for Mac OS X (x64)]({{release}}/hastyscribe_v1.1.0_macosx_x64.zip) -- Compiled on OS X Yosemite (LLVM CLANG 6.0)
   * [HastyScribe for Windows (x64)]({{release}}/hastyscribe_v1.1.0_windows_x64.zip) -- Cross-compiled on OS X Yosemite (MinGW-w64 GCC 4.8.2)
+  * [HastyScribe for Windows (x86)]({{release}}/hastyscribe_v1.1.0_windows_x86.zip) -- Cross-compiled on OS X Yosemite (MinGW-w64 GCC 4.8.2)
   * [HastyScribe for Linux (x86)]({{release}}/hastyscribe_v1.1.0_linux_x86.zip) -- Cross-compiled on OS X Yosemite (GNU GCC 4.8.1)
   * [HastyScribe for Linux (ARM)]({{release}}/hastyscribe_v1.1.0_linux_arm.zip) -- Cross-compiled on OS X Yosemite (GNU GCC 4.8.2)
 
@@ -740,7 +741,7 @@ HastyScribe is powered by the following open source software (see [LICENSE.md]({
 
 Special thanks to:
 
-* Philip Wernersbach, for contributing to HastyScribe.
+* Philip Wernersbach and Joshua Ellis, for contributing to {{hs}}.
 * Andreas Rumpf, creator of the amazing [Nim][nim] programming language, used to implement {{hs}}.
 * Ethan Lai, developer of the handy [Koala](http://koala-app.com/) app, used to compile all the LESS code into CSS.
 

hastyscribe.nim

@@ -13,7 +13,7 @@ from version import v
 
 let usage* = "  HastyScribe v" & v & " - Self-contained Markdown Compiler" & """
 
-  (c) 2013-2014 Fabio Cevasco
+  (c) 2013-2015 Fabio Cevasco
 
   Usage:
     hastyscribe markdown_file_or_glob.md [options]

hastyscribe.nim.cfg

@@ -2,14 +2,14 @@ define:release
 define:ssl
 
 # https://gist.github.com/Drakulix/9881160
-amd64.windows.gcc.path = "/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin"
-amd64.windows.gcc.exe = "i586-mingw32-gcc"
-amd64.windows.gcc.linkerexe = "i586-mingw32-gcc"
+amd64.windows.gcc.path = "/usr/local/mingw/bin"
+amd64.windows.gcc.exe = "x86_64-w64-mingw32-gcc"
+amd64.windows.gcc.linkerexe = "x86_64-w64-mingw32-gcc"
 
-# http://crossgcc.rts-software.org/doku.php?id=compiling_for_win32
-i386.windows.gcc.path = "/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin"
-i386.windows.gcc.exe = "i586-mingw32-gcc"
-i386.windows.gcc.linkerexe = "i586-mingw32-gcc"
+# https://gist.github.com/Drakulix/9881160
+i386.windows.gcc.path = "/usr/local/mingw/bin"
+i386.windows.gcc.exe = "i686-w64-mingw32-gcc"
+i386.windows.gcc.linkerexe = "i686-w64-mingw32-gcc"
 
 # http://crossgcc.rts-software.org/doku.php?id=compiling_for_linux
 i386.linux.gcc.path = "/usr/local/gcc-4.8.1-for-linux32/bin"

markdown.nim

@@ -175,9 +175,12 @@ proc md*(s: string, f = 0, data: var TMDMetadata): string =
   return
 
 when defined(macosx):
-  {.link: "vendor/libmarkdown_macosx_x86.a".}
+  {.link: "vendor/libmarkdown_macosx_x64.a".}
 when defined(windows):
-  {.link: "vendor/libmarkdown_windows_x86.a".}
+  when defined(i386):
+    {.link: "vendor/libmarkdown_windows_x86.a".}
+  when defined(amd64):
+    {.link: "vendor/libmarkdown_windows_x64.a".}
 when defined(linux):
   when defined(arm):
     {.link: "vendor/libmarkdown_linux_arm.a".}

nakefile.nim

@@ -7,7 +7,7 @@ const
   linux_arm = "--cpu:arm --os:linux"
   windows_x86 = "--cpu:i386 --os:windows"
   windows_x64 = "--cpu:amd64 --os:windows"
-  parallel = "--parallelBuild:1"
+  parallel = "--parallelBuild:1 --verbosity:3"
   hs = "hastyscribe"
   hs_file = "hastyscribe.nim"
   zip = "zip -X"
@@ -16,21 +16,25 @@ proc filename_for(os: string, arch: string): string =
   return "hastyscribe" & "_v" & v & "_" & os & "_" & arch & ".zip"
 
 task "windows-x86-build", "Build HastyScribe for Windows (x86)":
-  direshell compile, windows_x86,  hs_file
+  direshell compile, windows_x86, hs_file
 
 task "windows-x64-build", "Build HastyScribe for Windows (x64)":
-  direshell compile, windows_x64,  hs_file
+  direshell compile, windows_x64, hs_file
 
 task "linux-x86-build", "Build HastyScribe for Linux (x86)":
   direshell compile, linux_x86,  hs_file
 
 task "linux-arm-build", "Build HastyScribe for Linux (ARM)":
-  direshell compile, linux_arm, parallel,  hs_file
+  direshell compile, linux_arm,  hs_file
 
 task "macosx-x64-build", "Build HastyScribe for Mac OS X (x64)":
   direshell compile, hs_file
 
 task "release", "Release HastyScribe":
+  echo "\n\n\n WINDOWS - x86:\n\n"
+  runTask "windows-x86-build"
+  direshell zip, filename_for("windows", "x86"), hs & ".exe"
+  direshell "rm", hs & ".exe"
   echo "\n\n\n WINDOWS - x64:\n\n"
   runTask "windows-x64-build"
   direshell zip, filename_for("windows", "x64"), hs & ".exe"