jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed openssl lib path on Mac OS X;

Browse source
This commit is contained in:
Zahary Karadjov 2013-01-27 20:29:18 +02:00
commit 5d9153d420
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/syntaxes.nim
View file

@ -164,7 +164,7 @@ proc evalPipe(p: var TParsers, n: PNode, filename: string,
proc openParsers(p: var TParsers, fileIdx: int32, inputstream: PLLStream) = proc openParsers(p: var TParsers, fileIdx: int32, inputstream: PLLStream) =
var s: PLLStream var s: PLLStream
p.skin = skinStandard p.skin = skinStandard
let filename = fileIdx.toFilename let filename = fileIdx.toFullPath
var pipe = parsePipe(filename, inputStream) var pipe = parsePipe(filename, inputStream)
if pipe != nil: s = evalPipe(p, pipe, filename, inputStream) if pipe != nil: s = evalPipe(p, pipe, filename, inputStream)
else: s = inputStream else: s = inputStream

10
lib/wrappers/openssl.nim
View file

@ -46,14 +46,14 @@ when defined(WINDOWS):
else: else:
const const
versions = "(|.1.0.0|.0.9.9|.0.9.8|.0.9.7|.0.9.6|.0.9.5|.0.9.4)" 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 const
DLLSSLName = "libssl.so" & versions DLLSSLName = "libssl.so" & versions
DLLUtilName = "libcrypto.so" & versions DLLUtilName = "libcrypto.so" & versions
else:
const
DLLSSLName = "libssl.dylib" & versions
DLLUtilName = "libcrypto.dylib" & versions
type type
SslStruct {.final, pure.} = object SslStruct {.final, pure.} = object