kopia lustrzana https://github.com/Hamlib/Hamlib
Remove winpthreads.h
MSVC build now needs NuGet pthreads package to compile https://github.com/Hamlib/Hamlib/issues/1107pull/1119/head
rodzic
571f59e696
commit
1d0d733405
|
@ -85,3 +85,10 @@ same directory or in PATH as the resulting .exe otherwise it won't find it.
|
||||||
|
|
||||||
Mark J. Fine
|
Mark J. Fine
|
||||||
Remington, Virginia, USA
|
Remington, Virginia, USA
|
||||||
|
|
||||||
|
|
||||||
|
MSVC 2022
|
||||||
|
=========
|
||||||
|
MSVC C/C++ projects must use the NuGet pthread package in order to compile as of Sep 2022
|
||||||
|
An example C++ project is in bindings/MSVC
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,4 @@ noinst_HEADERS = bandplan.h num_stdio.h
|
||||||
nobase_include_HEADERS = hamlib/rig.h hamlib/riglist.h hamlib/rig_dll.h \
|
nobase_include_HEADERS = hamlib/rig.h hamlib/riglist.h hamlib/rig_dll.h \
|
||||||
hamlib/rotator.h hamlib/rotlist.h hamlib/rigclass.h \
|
hamlib/rotator.h hamlib/rotlist.h hamlib/rigclass.h \
|
||||||
hamlib/rotclass.h hamlib/amplifier.h hamlib/amplist.h \
|
hamlib/rotclass.h hamlib/amplifier.h hamlib/amplist.h \
|
||||||
hamlib/ampclass.h hamlib/config.h hamlib/winpthreads.h
|
hamlib/ampclass.h hamlib/config.h
|
||||||
|
|
|
@ -37,11 +37,12 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
// For MSVC install the NUGet pthread package
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
#include <winpthreads.h>
|
#define HAVE_STRUCT_TIMESPEC
|
||||||
#else
|
|
||||||
#include <pthread.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
/* Rig list is in a separate file so as not to mess up w/ this one */
|
/* Rig list is in a separate file so as not to mess up w/ this one */
|
||||||
#include <hamlib/riglist.h>
|
#include <hamlib/riglist.h>
|
||||||
|
|
Ładowanie…
Reference in New Issue