From: Eric Biggers Date: Sun, 27 Nov 2016 23:37:21 +0000 (-0800) Subject: Include import library and header in Windows releases X-Git-Tag: v1.11.0~49 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=5e67c512e083b0b018f561ca410b3d7049b67669 Include import library and header in Windows releases --- diff --git a/README.WINDOWS b/README.WINDOWS index 11ee8c66..00697e6f 100644 --- a/README.WINDOWS +++ b/README.WINDOWS @@ -18,17 +18,20 @@ The Windows distribution of wimlib is a ZIP file containing the following items: * Very short batch scripts (e.g. wimapply.cmd) which are shortcuts to the corresponding wimlib-imagex commands (e.g. `wimlib-imagex apply'). + * The library itself in DLL format (libwim-15.dll). wimlib-imagex.exe + requires this to run. + * The documentation, including this file, the generic README.txt, and PDF documentation for wimlib-imagex in the 'doc' directory. - * The library itself (libwim-15.dll). The C header wimlib.h is not - included; download the source if you want it. - * License files for all software included. These are all free software licenses. COPYING.txt is the main license, and it refers to COPYING.GPLv3.txt and COPYING.LGPLv3.txt. The other licenses are for third-party software included in the library. + * Development files in the 'devel' directory. These are only needed if you + are developing C or C++ applications that use wimlib. + Note that there are separate ZIP files for 32-bit (i686) and 64-bit (x86_64) binaries. They are both fully supported, but you should prefer the 64-bit binaries when possible as they can be noticeably faster. diff --git a/include/wimlib.h b/include/wimlib.h index 944c48ca..ac55fd2c 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -31,13 +31,16 @@ * * Download the Windows binary distribution with the appropriate architecture * (i686 or x86_64 --- also called "x86" and "amd64" respectively) from - * https://wimlib.net. Link your program with the libwim-15.dll file. Make - * sure to also download the source code so you can get wimlib.h, as it is not - * included in the binary distribution. If you need to access the DLL from - * other programming languages, note that the calling convention is "cdecl". + * https://wimlib.net. Link your program with libwim-15.dll. If needed by your + * programming language or development environment, the import library + * libwim.lib and C/C++ header wimlib.h can be found in the directory "devel" in + * the ZIP file. * - * Note that wimlib is developed using MinGW-w64, and there may be a little work - * required if you plan to use the header and DLL with Visual Studio. + * If you need to access the DLL from non-C/C++ programming languages, note that + * the calling convention is "cdecl". + * + * If you want to build wimlib from source on Windows, see README.WINDOWS. This + * is only needed if you are making modifications to wimlib. * * @section sec_examples Examples * diff --git a/tools/make-windows-release b/tools/make-windows-release index 660e1470..70cb5f6e 100755 --- a/tools/make-windows-release +++ b/tools/make-windows-release @@ -126,6 +126,12 @@ done gen_pdf_from_man_page wimlib-imagex +# Install development files + +mkdir $DESTDIR/devel +cp .libs/libwim.dll.a $DESTDIR/devel/libwim.lib +cp include/wimlib.h $DESTDIR/devel/ + # Generate ZIP file rm -f $ZIPFILE