Menu ▾ ▴

Code Merge Request #8: Support for 64-bit Windows builds and up to Visual Studio 2022 (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Loren M. Lang wants to merge 8 commits from /u/penguin359/trustedqsl/ to master, 2023-01-16

With the patches in this branch, Trusted QSL can now be compiled as 64-bit for the Windows platform. In addition, it also fixes some compatibility issues with newer versions of Visual Studio and can now be compiled successfully all the way up to VS 2022.

It also fixes the test suite to work on Windows via CTest from CMake.

Finally, it also fixes some warnings with wxWidgets and a crash when using the Berkeley DB back-end.

Commit Date  
[1ba1c9] (64bit-vs2022-fixes) by Loren M. Lang Loren M. Lang

Fixed locating test executables for CTest on Windows

 2023-01-11 08:49:54 Tree
[66348c] by Loren M. Lang Loren M. Lang

Don't treat warnings as errors in GoogleTest

The current version of GoogleTest included produces warnings on Visual
Studio 2019 and newer. Don't treat that as an error to avoid build
failures.

 2023-01-06 10:11:01 Tree
[8df5db] by Loren M. Lang Loren M. Lang

Ensure GoogleTest is using the same configuration for MSVCRT configuration

GoogleTest defaults to only producing static CRT configurations as it's
used as a static library in the test suite, but this breaks builds when
the project is configured for a dynamic CRT, the default. Keep
GoogleTest in sync with the main project.

 2023-01-06 10:08:34 Tree
[35c962] by Loren M. Lang Loren M. Lang

Removed extranous DLL import/export from main app

This triggers an undefined symbol error on all class methods in Visual
Studio 2019 and newer. Removing it since this class doesn't seem to be
used outside the app itself.

 2023-01-05 09:26:56 Tree
[668623] by Loren M. Lang Loren M. Lang

Fixed export definition for 64-bit

On the x64 platform, MSVC does not add the extra decorations around
the symbol and this triggers errors like the following when the normal
definition file is used:

Error 151 error LNK2001: unresolved external symbol _tqsl_adifGetError@...

 2023-01-03 07:56:18 Tree
[60f29a] by Loren M. Lang Loren M. Lang

Fixed compilation error on 64-bit builds

Including windef.h by itself triggers the following error on the x64
platform:

More details here:

https://stackoverflow.com/a/4845893/681359

 2023-01-03 07:42:50 Tree
[415a2c] by Loren M. Lang Loren M. Lang

Fixed warnings from wxWidgets produced in debug builds

While running Trusted QSL in the debug configuration, wxWidgets showed
this error:

wxALIGN_RIGHT will be ignored in this sizer: only vertical alignment
flags can be used in horizontal sizers

Removed all left/right alignment flags from the corresponding
wxBoxSizer(wxHORIZONTAL).

 2023-01-16 02:31:35 Tree
[8b2029] by Loren M. Lang Loren M. Lang

Fixed a double-abort crash when running with Berkeley DB backend

During OnInit(), tqsl_putDuplicateRecord() closes the aborts the
transaction as part of closing the database, but does not mark the
transaction as so in the BDB path causing a crash in tqsl_endConverter().

This patch always marks the TXN as NULL to avoid this.

 2023-01-16 02:34:56 Tree

Discussion

  • Rick Murphy

    Rick Murphy - 2023-01-16
    • Status: open --> merged
     

  • Rick Murphy

    Rick Murphy - 2023-01-16

    Reviewed the changes and all look good. Thanks for the updates and corrections.

     

Log in to post a comment.