Implemented linking via link pragma. * Closes #28
h3rald h3rald@h3rald.com
Fri, 21 Nov 2014 21:50:50 +0100
5 files changed,
22 insertions(+),
33 deletions(-)
M
doc/HastyScribe_UserGuide.htm
→
doc/HastyScribe_UserGuide.htm
@@ -229,13 +229,13 @@ <h2 id="Getting.Started">Getting Started<a href="#document-top" title="Go to top"></a></h2>
<h3 id="Downloading.Pre-built.Binaries">Downloading Pre-built Binaries<a href="#document-top" title="Go to top"></a></h3> -<p>The easiest way to get HastyScribe is by downloading one of the prebuilt binaries from the <a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.6">Github Release Page</a>:</p> +<p>The easiest way to get HastyScribe is by downloading one of the prebuilt binaries from the <a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.7">Github Release Page</a>:</p> <ul> -<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.6/hastyscribe_v1.0.6_macosx_x86.zip">HastyScribe for Mac OS X (x86)</a> – Compiled on OS X Mavericks (LLVM CLANG 6.0)</li> -<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.6/hastyscribe_v1.0.6_windows_x86.zip">HastyScribe for Windows (x86)</a> – Cross-compiled on OS X Mavericks (MinGW GCC 4.8.0)</li> -<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.6/hastyscribe_v1.0.6_linux_x86.zip">HastyScribe for Linux (x86)</a> – Cross-compiled on OS X Mavericks (GNU GCC 4.8.1)</li> -<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.6/hastyscribe_v1.0.6_linux_arm.zip">HastyScribe for Linux (ARM)</a> – Cross-compiled on OS X Mavericks (GNU GCC 4.8.2)</li> +<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.7/hastyscribe_v1.0.7_macosx_x86.zip">HastyScribe for Mac OS X (x86)</a> – Compiled on OS X Mavericks (LLVM CLANG 6.0)</li> +<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.7/hastyscribe_v1.0.7_windows_x86.zip">HastyScribe for Windows (x86)</a> – Cross-compiled on OS X Mavericks (MinGW GCC 4.8.0)</li> +<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.7/hastyscribe_v1.0.7_linux_x86.zip">HastyScribe for Linux (x86)</a> – Cross-compiled on OS X Mavericks (GNU GCC 4.8.1)</li> +<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.0.7/hastyscribe_v1.0.7_linux_arm.zip">HastyScribe for Linux (ARM)</a> – Cross-compiled on OS X Mavericks (GNU GCC 4.8.2)</li> </ul>@@ -1105,7 +1105,7 @@ </ul>
</div> <div id="footer"> - <p><span class="copy"></span> Fabio Cevasco – October 26, 2014</p> + <p><span class="copy"></span> Fabio Cevasco – November 21, 2014</p> <p><span>Powered by</span> <a href="https://h3rald.com/hastyscribe"><span class="hastyscribe"></span></a></p> </div> </body>
M
doc/HastyScribe_UserGuide.md
→
doc/HastyScribe_UserGuide.md
@@ -73,10 +73,10 @@ ### Downloading Pre-built Binaries
The easiest way to get {{hs}} is by downloading one of the prebuilt binaries from the [Github Release Page][release]: - * [HastyScribe for Mac OS X (x86)]({{release}}/hastyscribe_v1.0.6_macosx_x86.zip) -- Compiled on OS X Mavericks (LLVM CLANG 6.0) - * [HastyScribe for Windows (x86)]({{release}}/hastyscribe_v1.0.6_windows_x86.zip) -- Cross-compiled on OS X Mavericks (MinGW GCC 4.8.0) - * [HastyScribe for Linux (x86)]({{release}}/hastyscribe_v1.0.6_linux_x86.zip) -- Cross-compiled on OS X Mavericks (GNU GCC 4.8.1) - * [HastyScribe for Linux (ARM)]({{release}}/hastyscribe_v1.0.6_linux_arm.zip) -- Cross-compiled on OS X Mavericks (GNU GCC 4.8.2) + * [HastyScribe for Mac OS X (x86)]({{release}}/hastyscribe_v1.0.7_macosx_x86.zip) -- Compiled on OS X Mavericks (LLVM CLANG 6.0) + * [HastyScribe for Windows (x86)]({{release}}/hastyscribe_v1.0.7_windows_x86.zip) -- Cross-compiled on OS X Mavericks (MinGW GCC 4.8.0) + * [HastyScribe for Linux (x86)]({{release}}/hastyscribe_v1.0.7_linux_x86.zip) -- Cross-compiled on OS X Mavericks (GNU GCC 4.8.1) + * [HastyScribe for Linux (ARM)]({{release}}/hastyscribe_v1.0.7_linux_arm.zip) -- Cross-compiled on OS X Mavericks (GNU GCC 4.8.2) ### Installing using Nimble@@ -734,4 +734,4 @@ [fa]:http://fortawesome.github.io/Font-Awesome/
[fa-icons]:http://fortawesome.github.io/Font-Awesome/icons/ [pme]:http://michelf.com/projects/php-markdown/extra/ [sudtipos]:http://www.sudtipos.com/ -[release]:{{release -> https://github.com/h3rald/hastyscribe/releases/download/v1.0.6}} +[release]:{{release -> https://github.com/h3rald/hastyscribe/releases/download/v1.0.7}}
M
hastyscribe.nimrod.cfg
→
hastyscribe.nimrod.cfg
@@ -14,24 +14,3 @@ # http://www.jaredwolff.com/toolchains/
arm.linux.gcc.path = "/usr/local/arm-none-linux-gnueabi/bin" arm.linux.gcc.exe = "arm-none-linux-gnueabi-gcc" arm.linux.gcc.linkerexe = "arm-none-linux-gnueabi-gcc" - -putenv: "LIBRARY_PATH=/tmp/nimble/hastyscribe/vendor:/tmp/nimble/hastyscribe_head/vendor:/private/tmp/nimble/hastyscribe_head/vendor:/private/tmp/nimble/hastyscribe/vendor" - -passL: "-lm" -passL: "-L./vendor" - -@if macosx: - passL: "-lmarkdown_macosx_x86" -@end - -@if windows: - passL: "-lmarkdown_windows_x86" -@end - -@if linux: - @if arm: - passL: "-lmarkdown_linux_arm" - @else: - passL: "-lmarkdown_linux_x86" - @end -@end
M
markdown.nim
→
markdown.nim
@@ -173,3 +173,13 @@ discard mkd_document(mmiot, res)
result = cstringArrayToSeq(res)[0] mkd_cleanup(mmiot) return + +when defined(macosx): + {.link: "vendor/libmarkdown_macosx_x86.a".} +when defined(windows): + {.link: "vendor/libmarkdown_windows_x86.a".} +when defined(linux): + when defined(arm): + {.link: "vendor/libmarkdown_linux_arm.a".} + when defined(i386) or defined(amd64): + {.link: "vendor/libmarkdown_linux_x86.a".}