diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ghdldrv/default_paths.ads.in | 3 | ||||
-rw-r--r-- | src/version.in | 2 | ||||
-rw-r--r-- | src/vhdl/python/libghdl/__init__.py | 11 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/ghdldrv/default_paths.ads.in b/src/ghdldrv/default_paths.ads.in index da2f7cc42..e6137789d 100644 --- a/src/ghdldrv/default_paths.ads.in +++ b/src/ghdldrv/default_paths.ads.in @@ -37,7 +37,6 @@ package Default_Paths is Post_Processor : constant String := "@POST_PROCESSOR@"; - Shared_Library_Extension : constant String := - "@SOEXT@"; + Shared_Library_Extension : constant String := "@SOEXT@"; Default_Pie : constant Boolean := "@default_pie@" = String'("yes"); end Default_Paths; diff --git a/src/version.in b/src/version.in index 32ef90cc9..b12295dab 100644 --- a/src/version.in +++ b/src/version.in @@ -1,5 +1,5 @@ package Version is - Ghdl_Ver : constant String := "0.36-dev"; + Ghdl_Ver : constant String := "@VER@"; Ghdl_Release : constant String := "(tarball) [Dunoon edition]"; end Version; diff --git a/src/vhdl/python/libghdl/__init__.py b/src/vhdl/python/libghdl/__init__.py index 457d6f2bd..8ca7a977b 100644 --- a/src/vhdl/python/libghdl/__init__.py +++ b/src/vhdl/python/libghdl/__init__.py @@ -1,17 +1,10 @@ import ctypes -import sys import os.path - -_ext = {'linux': '.so', - 'linux2': '.so', - 'darwin': '.dylib', - 'win32': '.dll', - 'cygwin': '.dll'} +from libghdl.config import libghdl_filename # Load the DLL. _basedir = os.path.dirname(__file__) -libghdl = ctypes.CDLL(os.path.join( - _basedir, 'libghdl' + _ext.get(sys.platform, '.so'))) +libghdl = ctypes.CDLL(os.path.join(_basedir, libghdl_filename)) # Low-level initialization (elaboration). libghdl.libghdl_init() |