From 9f6a391ea48da29f46aa92a500df91a944e39307 Mon Sep 17 00:00:00 2001 From: Vadim Zborovskii Date: Sun, 18 Aug 2013 14:58:27 +0400 Subject: Unbreak shared build on Windows. Collect all version ids to auto.def. --- auto.def | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'auto.def') diff --git a/auto.def b/auto.def index fdea132..1bb6f7c 100644 --- a/auto.def +++ b/auto.def @@ -1,6 +1,8 @@ # vim:se syn=tcl: # +define JIM_VERSION 75 + # Note: modules which support options *must* be included before 'options' use cc cc-shared cc-db cc-lib use local @@ -117,12 +119,6 @@ switch -glob -- $host_os { } } -if {[have-feature windows]} { - define LIBSOEXT dll -} else { - define LIBSOEXT so -} - # Find some tools cc-check-tools ar ranlib strip define tclsh [info nameofexecutable] @@ -188,6 +184,7 @@ if {[opt-bool shared with-jim-shared]} { msg-result "Building static library" define JIM_STATICLIB } +define LIBSOEXT [format [get-define SH_SOEXTVER] [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]]] define JIM_INSTALL [opt-bool install-jim] define JIM_DOCS [opt-bool docs] @@ -333,7 +330,7 @@ define C_EXT_SHOBJS [suffix .so $extinfo(module-c)] define TCL_EXTS [suffix .tcl $extinfo(module-tcl)] define EXTRA_OBJS $extra_objs -make-config-header jim-config.h -auto {HAVE_LONG_LONG* JIM_UTF8} -none * +make-config-header jim-config.h -auto {HAVE_LONG_LONG* JIM_UTF8} -bare JIM_VERSION -none * make-config-header jimautoconf.h -auto {jim_ext_* TCL_PLATFORM_* TCL_LIBRARY USE_* JIM_* _FILE_OFFSET*} make-template Makefile.in make-template build-jim-ext.in -- cgit v1.1