[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 0d1481d86f9ebf889525c
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 0d1481d86f9ebf889525cc53b0f02e14d340361a
|
From: n0nb <n0...@us...> - 2025-08-10 23:14:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via 0d1481d86f9ebf889525cc53b0f02e14d340361a (commit)
from c1aaeba5acd6f1a78163d7b9fc86d4f268ef78d4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0d1481d86f9ebf889525cc53b0f02e14d340361a
Author: Nate Bargmann <n0...@n0...>
Date: Sun Aug 10 10:39:54 2025 -0500
Update W32 and W64 build scripts
Renaming the lib\gcc directory to lib\gcc-mingw broke the build of
WSJT-X. See (yes, the archive sucks):
https://sourceforge.net/p/hamlib/mailman/message/59215755/
diff --git a/scripts/build-w32.sh b/scripts/build-w32.sh
index 76c766a4a..e518d27b8 100755
--- a/scripts/build-w32.sh
+++ b/scripts/build-w32.sh
@@ -100,7 +100,7 @@ hamlib-w32-4.7~git
├── include
│ └── hamlib
└── lib
- ├── gcc-mingw
+ ├── gcc
└── msvc
The 'bin' and 'doc' directories will be of interest to users while developers
@@ -198,8 +198,8 @@ program is not considered a "derivative work" when using the published Hamlib
API and normal linking to the front-end library, and may be of a license of
your choosing.
-As of 21 Jul 2025 a .lib file is generated using the MinGW dlltool utility.
-This file is now installed to the lib\gcc-mingw directory. As it is generated
+As of 04 Aug 2025 a .lib file is generated using the MinGW dlltool utility.
+This file is now installed to the lib\gcc directory. As it is generated
by the MinGW dlltool utility, it is only suitable for use with MinGW/GCC.
For developers using Microsoft Visual Studio, the following recipe is
@@ -255,9 +255,9 @@ END_OF_README
LDFLAGS="-L${LIBUSB_1_0_BIN_PATH}/MinGW32/dll"
-make -j 4 install
+make -j 4 --no-print-directory install
-mkdir -p ${ZIP_DIR}/bin ${ZIP_DIR}/lib/msvc ${ZIP_DIR}/lib/gcc-mingw ${ZIP_DIR}/include ${ZIP_DIR}/doc
+mkdir -p ${ZIP_DIR}/bin ${ZIP_DIR}/lib/msvc ${ZIP_DIR}/lib/gcc ${ZIP_DIR}/include ${ZIP_DIR}/doc
cp -a src/libhamlib.def ${ZIP_DIR}/lib/msvc/libhamlib-4.def
todos ${ZIP_DIR}/lib/msvc/libhamlib-4.def
cp -a ${INST_DIR}/include/hamlib ${ZIP_DIR}/include/.
@@ -291,7 +291,7 @@ do
done
cp -a ${INST_DIR}/bin/libhamlib-?.dll ${ZIP_DIR}/bin/.
-cp -a ${INST_DIR}/lib/libhamlib.dll.a ${ZIP_DIR}/lib/gcc-mingw/.
+cp -a ${INST_DIR}/lib/libhamlib.dll.a ${ZIP_DIR}/lib/gcc/.
# NB: Strip Hamlib DLLs and EXEs
${HOST_ARCH_STRIP} ${ZIP_DIR}/bin/*.exe ${ZIP_DIR}/bin/*hamlib-*.dll
@@ -337,6 +337,6 @@ fi
# Generate .lib file for GCC on MinGW per Jonathan Yong from mingw-w64
# https://sourceforge.net/p/mingw-w64/discussion/723798/thread/e23dceba20/?limit=25#51dd/3df2/3708/e62b
-${HOST_ARCH_DLLTOOL} --input-def ${ZIP_DIR}/lib/msvc/libhamlib-4.def --output-lib ${ZIP_DIR}/lib/gcc-mingw/libhamlib-4.lib
+${HOST_ARCH_DLLTOOL} --input-def ${ZIP_DIR}/lib/msvc/libhamlib-4.def --output-lib ${ZIP_DIR}/lib/gcc/libhamlib-4.lib
/usr/bin/zip -r ${HL_FILENAME}.zip $(basename ${ZIP_DIR})
diff --git a/scripts/build-w64.sh b/scripts/build-w64.sh
index 12a116cc6..40f0643ce 100755
--- a/scripts/build-w64.sh
+++ b/scripts/build-w64.sh
@@ -100,7 +100,7 @@ hamlib-w64-4.7~git
├── include
│ └── hamlib
└── lib
- ├── gcc-mingw
+ ├── gcc
└── msvc
The 'bin' and 'doc' directories will be of interest to users while developers
@@ -188,7 +188,7 @@ There is a libhamlib-4.def definition file for MS Visual C++/Visual Studio in
lib\msvc. Refer to the recipe below to generate a local libhamlib-4.lib file
for use with the VC++/VS linker.
-Simply '#include <hamlib/rig.h>' (pr any other header) (add directory to
+Simply '#include <hamlib/rig.h>' (or any other header) (add directory to
include path), include libhamlib-4.lib in your project and you are done. Note:
VC++/VS cannot compile all the Hamlib code, but the API defined by rig.h has
been made MSVC friendly :-)
@@ -198,8 +198,8 @@ program is not considered a "derivative work" when using the published Hamlib
API and normal linking to the front-end library, and may be of a license of
your choosing.
-As of 21 Jul 2025 a .lib file is generated using the MinGW dlltool utility.
-This file is now installed to the lib\gcc-mingw directory. As it is generated
+As of 04 Aug 2025 a .lib file is generated using the MinGW dlltool utility.
+This file is now installed to the lib\gcc directory. As it is generated
by the MinGW dlltool utility, it is only suitable for use with MinGW/GCC.
For developers using Microsoft Visual Studio, the following recipe is
@@ -255,9 +255,9 @@ END_OF_README
LDFLAGS="-L${LIBUSB_1_0_BIN_PATH}/MinGW64/dll"
-make -j 4 install
+make -j 4 --no-print-directory install
-mkdir -p ${ZIP_DIR}/bin ${ZIP_DIR}/lib/msvc ${ZIP_DIR}/lib/gcc-mingw ${ZIP_DIR}/include ${ZIP_DIR}/doc
+mkdir -p ${ZIP_DIR}/bin ${ZIP_DIR}/lib/msvc ${ZIP_DIR}/lib/gcc ${ZIP_DIR}/include ${ZIP_DIR}/doc
cp -a src/libhamlib.def ${ZIP_DIR}/lib/msvc/libhamlib-4.def
todos ${ZIP_DIR}/lib/msvc/libhamlib-4.def
cp -a ${INST_DIR}/include/hamlib ${ZIP_DIR}/include/.
@@ -291,7 +291,7 @@ do
done
cp -a ${INST_DIR}/bin/libhamlib-?.dll ${ZIP_DIR}/bin/.
-cp -a ${INST_DIR}/lib/libhamlib.dll.a ${ZIP_DIR}/lib/gcc-mingw/.
+cp -a ${INST_DIR}/lib/libhamlib.dll.a ${ZIP_DIR}/lib/gcc/.
# NB: Strip Hamlib DLLs and EXEs
${HOST_ARCH_STRIP} ${ZIP_DIR}/bin/*.exe ${ZIP_DIR}/bin/*hamlib-*.dll
@@ -337,6 +337,6 @@ fi
# Generate .lib file for GCC on MinGW per Jonathan Yong from mingw-w64
# https://sourceforge.net/p/mingw-w64/discussion/723798/thread/e23dceba20/?limit=25#51dd/3df2/3708/e62b
-${HOST_ARCH_DLLTOOL} --input-def ${ZIP_DIR}/lib/msvc/libhamlib-4.def --output-lib ${ZIP_DIR}/lib/gcc-mingw/libhamlib-4.lib
+${HOST_ARCH_DLLTOOL} --input-def ${ZIP_DIR}/lib/msvc/libhamlib-4.def --output-lib ${ZIP_DIR}/lib/gcc/libhamlib-4.lib
/usr/bin/zip -r ${HL_FILENAME}.zip $(basename ${ZIP_DIR})
-----------------------------------------------------------------------
Summary of changes:
scripts/build-w32.sh | 14 +++++++-------
scripts/build-w64.sh | 16 ++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
