diff --git a/src/Makefile.w64 b/src/Makefile.w64 index 29938544dde4c0b3d3a42c434ef83b3d217cd2bd..f9299ebda06f3870787dab3b0aa08a5050d1c78f 100644 --- a/src/Makefile.w64 +++ b/src/Makefile.w64 @@ -40,8 +40,8 @@ exec_prefix=${prefix} bindir=${exec_prefix}/bin/ libdir=${exec_prefix}/lib/ includedir=${prefix}/include/ -mkcldir=${exec_prefix}/lib/mkcl-1.1.0/ -localmkcldir=./lib/mkcl-1.1.0/ +mkcldir=${exec_prefix}/lib/mkcl-1.1.1/ +localmkcldir=./lib/mkcl-1.1.1/ # Programs used by "make install": # @@ -57,7 +57,7 @@ mkinstalldirs = $(SHELL) ./gc/mkinstalldirs SUBDIRS = c gc LIBRARIES = libmkclgc.a -LSP_LIBRARIES = mkcl_1.1.0.dll +LSP_LIBRARIES = mkcl_1.1.1.dll TARGETS = bin/mkcl$(EXE) MKCL_HFILES = mkcl/config.h \ diff --git a/src/c/Makefile.w64 b/src/c/Makefile.w64 index 109619cd278161bb4b37a5f89a7c940359f5a626..009820fd3e5176bb0bbd9ed3f648252a1fcac605 100644 --- a/src/c/Makefile.w64 +++ b/src/c/Makefile.w64 @@ -13,9 +13,9 @@ # See file '../../Copyright' for full details. # # -top_srcdir= /home/Jean-Claude/mkcl/src -srcdir = /home/Jean-Claude/mkcl/src/c -VPATH = /home/Jean-Claude/mkcl/src/c +top_srcdir= /home/Jean-Claude/mkcl-1.1.1/src +srcdir = /home/Jean-Claude/mkcl-1.1.1/src/c +VPATH = /home/Jean-Claude/mkcl-1.1.1/src/c # Programs used by "make": # @@ -83,7 +83,7 @@ all: ../libmkclmin.a ../libmkcltop.a all_symbols.o all_symbols2.o cinit.o $(DPP) $< $@ unixfsys.o: unixfsys.c - $(CC) -DMKCL_LIBDIR="\"${exec_prefix}/lib/mkcl-1.1.0\"" -DMKCL_VERSION="\"1.1.0\"" $(CFLAGS) -o $@ -c $< + $(CC) -DMKCL_LIBDIR="\"${exec_prefix}/lib/mkcl-1.1.1\"" -DMKCL_VERSION="\"1.1.1\"" $(CFLAGS) -o $@ -c $< $(DCFILES) all_symbols.c cinit.c: $(DPP) diff --git a/src/cmp/cmpdefs.pre.w64 b/src/cmp/cmpdefs.pre.w64 index 8f9eb77e99acb146ce2925459fa8fa5b2a608bf7..de5fcf23a89969a0acde57672805085cc61d4149 100644 --- a/src/cmp/cmpdefs.pre.w64 +++ b/src/cmp/cmpdefs.pre.w64 @@ -502,7 +502,7 @@ coprocessor).") (defvar *external-ld-flags* " -lws2_32 -lm ") ;; -lws2_32 ?? (defvar *ld-flags* - #+unix (mkcl:bstr+ "-lmkcl " *external-ld-flags*) + #+unix (mkcl:bstr+ "\"~Amkcl_" (si:mkcl-version) ".dll\" " *external-ld-flags*) #+(or mingw32 mingw64) (mkcl:bstr+ "\"~Amkcl_" (si:mkcl-version) ".dll\" " *external-ld-flags*) #+msvc (mkcl:bstr+ "mkcl.lib " *external-ld-flags*) ) diff --git a/src/compile.pre.w64 b/src/compile.pre.w64 index 8e67acb4d922185f671924dabde21865d72dab77..5e8b9e23a1cffbcc7e509a4e73334e71918610a6 100644 --- a/src/compile.pre.w64 +++ b/src/compile.pre.w64 @@ -140,8 +140,8 @@ ;;(*compile-verbose* t) ;;(*compile-print* t) ) - (format t "~&;;About to build shared library libmkcl.so~%") - (unless (compiler:build-shared-library (mkcl:bstr+ "mkcl_" (si:mkcl-version) ".so") + (format t "~&;;About to build shared library mkcl_~A.dll~%" (si:mkcl-version)) + (unless (compiler:build-shared-library (mkcl:bstr+ "mkcl_" (si:mkcl-version) ".dll") ;;"mkcl" ;;(compile-file-pathname "mkcl" :type :dll) :extra-ld-flags extra-ld-flags :object-files (list "c/all_symbols2.o" diff --git a/src/mkcl/config.h.w64 b/src/mkcl/config.h.w64 index 234eb7b1a60822a1c153527f09fb15c9a3238871..235a429174b910bdc4f688a1dfbcdf84902b80ca 100644 --- a/src/mkcl/config.h.w64 +++ b/src/mkcl/config.h.w64 @@ -48,10 +48,10 @@ #endif /* Decimal number made with the formula: MAJOR * 1000000 + MINOR * 10000 + PATCH */ -#define MKCL_VERSION_NUMBER 1010000 +#define MKCL_VERSION_NUMBER 1010001 #define MKCL_MAJOR_VERSION 1 #define MKCL_MINOR_VERSION 1 -#define MKCL_PATCH_LEVEL 0 +#define MKCL_PATCH_LEVEL 1 /* * FEATURES LINKED IN