summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorZahary Karadjov <zahary@gmail.com>2013-01-27 20:29:18 +0200
committerZahary Karadjov <zahary@gmail.com>2013-01-27 20:29:18 +0200
commit5d9153d4207aaa04adb6e304e76f598fc3b9a107 (patch)
tree436d3fc6e2bbcd7ca5b5eaa2120064d55330c7b4
parent9c3bd7f43598a42959fa979e6a6908311e4751bc (diff)
downloadNim-5d9153d4207aaa04adb6e304e76f598fc3b9a107.tar.gz
Fixed openssl lib path on Mac OS X;
-rwxr-xr-xcompiler/syntaxes.nim2
-rwxr-xr-xlib/wrappers/openssl.nim10
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/syntaxes.nim b/compiler/syntaxes.nim
index 83c9180f4..3965cb3fe 100755
--- a/compiler/syntaxes.nim
+++ b/compiler/syntaxes.nim
@@ -164,7 +164,7 @@ proc evalPipe(p: var TParsers, n: PNode, filename: string,
 proc openParsers(p: var TParsers, fileIdx: int32, inputstream: PLLStream) = 
   var s: PLLStream
   p.skin = skinStandard
-  let filename = fileIdx.toFilename
+  let filename = fileIdx.toFullPath
   var pipe = parsePipe(filename, inputStream)
   if pipe != nil: s = evalPipe(p, pipe, filename, inputStream)
   else: s = inputStream
diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim
index 1063f401d..d33eded68 100755
--- a/lib/wrappers/openssl.nim
+++ b/lib/wrappers/openssl.nim
@@ -46,14 +46,14 @@ when defined(WINDOWS):
 else:
   const
     versions = "(|.1.0.0|.0.9.9|.0.9.8|.0.9.7|.0.9.6|.0.9.5|.0.9.4)"
-  when defined(posix):
+  when defined(macosx):
+    const
+      DLLSSLName = "libssl" & versions & ".dylib"
+      DLLUtilName = "libcrypto" & versions & ".dylib"
+  else:
     const 
       DLLSSLName = "libssl.so" & versions
       DLLUtilName = "libcrypto.so" & versions
-  else: 
-    const 
-      DLLSSLName = "libssl.dylib" & versions
-      DLLUtilName = "libcrypto.dylib" & versions
 
 type 
   SslStruct {.final, pure.} = object