fixes DLL hell on Windows

This commit is contained in:
Araq 2015-09-05 12:03:53 +02:00
commit 0320c0c73b
5 changed files with 41 additions and 7 deletions

View file

@ -14,9 +14,15 @@
const useWinVersion = defined(Windows) or defined(nimdoc)
when useWinVersion:
const
DLLSSLName = "(ssleay32|libssl32).dll"
DLLUtilName = "libeay32.dll"
when not defined(nimOldDlls) and defined(cpu64):
const
DLLSSLName = "(ssleay64|libssl64).dll"
DLLUtilName = "libeay64.dll"
else:
const
DLLSSLName = "(ssleay32|libssl32).dll"
DLLUtilName = "libeay32.dll"
from winlean import SocketHandle
else:
const

View file

@ -310,7 +310,12 @@ type
when not defined(usePcreHeader):
when hostOS == "windows":
const pcreDll = "pcre.dll"
when defined(nimOldDlls):
const pcreDll = "pcre.dll"
elif defined(cpu64):
const pcreDll = "pcre64.dll"
else:
const pcreDll = "pcre32.dll"
elif hostOS == "macosx":
const pcreDll = "libpcre(.3|.1|).dylib"
else:

View file

@ -42,8 +42,14 @@ pdcwin.h:
when defined(windows):
import windows
when defined(nimOldDlls):
const pdcursesdll = "pdcurses.dll"
elif defined(cpu64):
const pdcursesdll = "pdcurses64.dll"
else:
const pdcursesdll = "pdcurses32.dll"
const
pdcursesdll = "pdcurses.dll"
unixOS = false
{.pragma: extdecl, stdcall.}

View file

@ -9,8 +9,12 @@
{.deadCodeElim: on.}
when defined(windows):
const
Lib = "sqlite3.dll"
when defined(nimOldDlls):
const Lib = "sqlite3.dll"
elif defined(cpu64):
const Lib = "sqlite3_64.dll"
else:
const Lib = "sqlite3_32.dll"
elif defined(macosx):
const
Lib = "libsqlite3(|.0).dylib"