From c2b36a0343ed8af0f817743a7b662900cc7c1d92 Mon Sep 17 00:00:00 2001 From: Dustin Lacewell Date: Wed, 3 Dec 2014 13:26:37 -0800 Subject: [PATCH 1/2] Adds some flexibility to the lib name of SDL_ttf to allow for newer distributions --- lib/wrappers/sdl/sdl_ttf.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wrappers/sdl/sdl_ttf.nim b/lib/wrappers/sdl/sdl_ttf.nim index e0410c798f..cbea7c078c 100644 --- a/lib/wrappers/sdl/sdl_ttf.nim +++ b/lib/wrappers/sdl/sdl_ttf.nim @@ -163,7 +163,7 @@ elif defined(macosx): ttfLibName = "libSDL_ttf-2.0.0.dylib" else: const - ttfLibName = "libSDL_ttf.so(|.1|.0)" + ttfLibName = "libSDL_ttf(-2.0|).so(|.1|.0)" const MAJOR_VERSION* = 2 MINOR_VERSION* = 0 From 51d2096cd340ec9ef0cb1e598d5c389a95b9c456 Mon Sep 17 00:00:00 2001 From: Dustin Lacewell Date: Wed, 3 Dec 2014 15:15:58 -0800 Subject: [PATCH 2/2] Update the pattern to prefer the old version --- lib/pure/sockets.nim | 3 ++- lib/wrappers/sdl/sdl_ttf.nim | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim index 99cdc002c6..e3c32e806e 100644 --- a/lib/pure/sockets.nim +++ b/lib/pure/sockets.nim @@ -45,7 +45,8 @@ else: # Note: The enumerations are mapped to Window's constants. -when defined(ssl): +when defined(ssl): + type SSLError* = object of Exception diff --git a/lib/wrappers/sdl/sdl_ttf.nim b/lib/wrappers/sdl/sdl_ttf.nim index cbea7c078c..9ebe70b9d2 100644 --- a/lib/wrappers/sdl/sdl_ttf.nim +++ b/lib/wrappers/sdl/sdl_ttf.nim @@ -163,7 +163,7 @@ elif defined(macosx): ttfLibName = "libSDL_ttf-2.0.0.dylib" else: const - ttfLibName = "libSDL_ttf(-2.0|).so(|.1|.0)" + ttfLibName = "libSDL_ttf(|-2.0).so(|.1|.0)" const MAJOR_VERSION* = 2 MINOR_VERSION* = 0