Merge branch 'master' of https://github.com/Hamlib/Hamlib

configure.ac

@@ -287,6 +287,7 @@ AS_CASE(["$host_os"],
     [mingw* | pw32* | cygwin*], [
 	AM_CONDITIONAL([VERSIONDLL], true)
 	WINLDFLAGS="-Wl,--output-def,libhamlib.def -Wl,--add-stdcall-alias"
+    VERSIONDLL="version_dll.rc"
 	AC_SUBST([WINLDFLAGS])
 
 	# Enable ld's "auto import" for executables

src/Makefile.am

@@ -18,7 +18,7 @@ RIGSRC +=	\
 endif
 
 lib_LTLIBRARIES = libhamlib.la
-libhamlib_la_SOURCES = $(RIGSRC)
+libhamlib_la_SOURCES = $(RIGSRC) $(VERSIONDLL)
 libhamlib_la_LDFLAGS = $(WINLDFLAGS) $(OSXLDFLAGS) -no-undefined -version-info $(ABI_VERSION):$(ABI_REVISION):$(ABI_AGE)
 
 libhamlib_la_LIBADD = $(top_builddir)/lib/libmisc.la $(top_builddir)/security/libsecurity.la \

src/version_dll.rc

@@ -9,6 +9,7 @@ VERSIONINFO_1 VERSIONINFO
   {
    BLOCK "040904E4"
    {
+<<<<<<< HEAD
     VALUE "FileDescription", "Hamlib DLL"
     VALUE "FileVersion", "4.6.0.0"
     VALUE "ProductName", "Hamlib"
@@ -16,13 +17,27 @@ VERSIONINFO_1 VERSIONINFO
     VALUE "InternalName", "sha256"
     VALUE "LegalCopyright", "Copyright Hamlib Team 2022"
     VALUE "OriginalFilename", "libhamlib-4.dll"
+=======
+    VALUE "CompanyName", "Hamlib Team\000"
+    VALUE "FileDescription", "Hamlib DLL\000"
+    VALUE "ProductName", "Hamlib\000"
+    VALUE "FileVersion", 4,6,0,0
+    VALUE "ProductVersion", HAMLIBDATETIME
+    VALUE "InternalName", "sha256"
+    VALUE "LegalCopyright", "Copyright Hamlib Team 2022\000"
+    VALUE "OriginalFilename", "libhamlib-4.dll\000"
+>>>>>>> cafc094788fcdd65e5fb936e5451a08b780c8ecd
    }
 
   }
 
   BLOCK "VarFileInfo"
   {
+<<<<<<< HEAD
    VALUE "Translation", 0x409, 1200
+=======
+   VALUE "Translation", 0x409, 1252
+>>>>>>> cafc094788fcdd65e5fb936e5451a08b780c8ecd
   }
 
 }