[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. d4401112d06d1a85440ed216684d44f579cc15fe

[n0nb <n0...@us...>]

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  d4401112d06d1a85440ed216684d44f579cc15fe (commit)
       via  fa72d4fe9d30a8ad875d40a20a75520c7bfc44a3 (commit)
      from  5b9ce8c5d10133f3b84775307ebf0ecf15253c7b (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 d4401112d06d1a85440ed216684d44f579cc15fe
Author: Nate Bargmann <n0...@n0...>
Date:   Thu Sep 18 11:08:14 2025 -0500

    Update Windows build scripts for pkg-config
    
    Add values for LIBUSB_CFLAGS and LIBUSB_LIBS to override pkg-config
    search for libusb-1.0.
    
    The scripts were tested with the prior AC_CHECK_HEADERS detection and
    pkg-config.

diff --git a/scripts/build-w32.sh b/scripts/build-w32.sh
index ea6fc8904..5c4c11b68 100755
--- a/scripts/build-w32.sh
+++ b/scripts/build-w32.sh
@@ -252,7 +252,10 @@ END_OF_README
  --without-cxx-binding \
  --disable-static \
  CPPFLAGS="-I${LIBUSB_1_0_BIN_PATH}/include" \
- LDFLAGS="-L${LIBUSB_1_0_BIN_PATH}/MinGW32/dll"
+ LDFLAGS="-L${LIBUSB_1_0_BIN_PATH}/MinGW32/dll" \
+ LIBUSB_CFLAGS="-I${LIBUSB_1_0_BIN_PATH}/include/libusb-1.0" \
+ LIBUSB_LIBS="-lusb-1.0"
+
 
 
 make -j 4 --no-print-directory install
diff --git a/scripts/build-w64.sh b/scripts/build-w64.sh
index 0fa2addb8..54d19746c 100755
--- a/scripts/build-w64.sh
+++ b/scripts/build-w64.sh
@@ -245,14 +245,20 @@ http://www.hamlib.org
 END_OF_README
 
 
+echo $PKG_CONFIG_PATH
+
 # Configure and build hamlib for x86_64-w64-mingw32, with libusb-1.0
 
 ./configure --host=${HOST_ARCH} \
+ --build=$(uname -m) \
+ --target=${HOST_ARCH} \
  --prefix=${INST_DIR} \
  --without-cxx-binding \
  --disable-static \
  CPPFLAGS="-I${LIBUSB_1_0_BIN_PATH}/include" \
- LDFLAGS="-L${LIBUSB_1_0_BIN_PATH}/MinGW64/dll"
+ LDFLAGS="-L${LIBUSB_1_0_BIN_PATH}/MinGW64/dll" \
+ LIBUSB_CFLAGS="-I${LIBUSB_1_0_BIN_PATH}/include/libusb-1.0" \
+ LIBUSB_LIBS="-lusb-1.0"
 
 
 make -j 4 --no-print-directory install

commit fa72d4fe9d30a8ad875d40a20a75520c7bfc44a3
Author: Philip Rose <gm...@bt...>
Date:   Wed Sep 10 22:17:43 2025 +0100

    Use proper syntax for MS Windows command line options
    
    Phil, GM3ZZA, writes:
    
    I have finally got round to building my app with 4.6.5 on Windows. My
    previous instructions for building the .lib for MSVC are slightly wrong.
    It has the wrong flavour slash for the Windows switch indicator.
    
    73 Phil GM3ZZA.

diff --git a/scripts/build-w32.sh b/scripts/build-w32.sh
index e518d27b8..ea6fc8904 100755
--- a/scripts/build-w32.sh
+++ b/scripts/build-w32.sh
@@ -214,7 +214,7 @@ correct directory to the path and allows update of "C:\Program Files" with the
 Then (in my case).
 
 cd "C:\Program Files\hamlib-w32-${RELEASE}\lib\msvc"
-lib \def:libhamlib-4.def \machine:x86
+lib /def:libhamlib-4.def /machine:x86
 
 If you use any other terminal then the full path to lib.exe is needed
 (today it is
diff --git a/scripts/build-w64.sh b/scripts/build-w64.sh
index 40f0643ce..0fa2addb8 100755
--- a/scripts/build-w64.sh
+++ b/scripts/build-w64.sh
@@ -214,7 +214,7 @@ correct directory to the path and allows update of "C:\Program Files" with the
 Then (in my case).
 
 cd "C:\Program Files\hamlib-w64-${RELEASE}\lib\msvc"
-lib \def:libhamlib-4.def \machine:x64
+lib /def:libhamlib-4.def /machine:x64
 
 If you use any other terminal then the full path to lib.exe is needed
 (today it is

-----------------------------------------------------------------------

Summary of changes:
 scripts/build-w32.sh |  7 +++++--
 scripts/build-w64.sh | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries