mirror of
https://github.com/RfidResearchGroup/ChameleonUltra.git
synced 2026-05-12 11:22:59 -07:00
Merge branch 'RfidResearchGroup:main' into t55write
This commit is contained in:
@@ -26,6 +26,7 @@ Read the [available documentation](https://github.com/RfidResearchGroup/Chameleo
|
||||
|
||||
* [ChameleonUltraGUI](https://github.com/GameTec-live/ChameleonUltraGUI)
|
||||
* [MTools BLE](https://github.com/RfidResearchGroup/ChameleonUltra/wiki/mtoolsble)
|
||||
* [Mifare Chameleon Tool (iOS only, Beta)](https://apps.apple.com/it/app/mifare-chameleon-tool/id6761231484)
|
||||
|
||||
# Videos
|
||||
|
||||
@@ -45,4 +46,4 @@ Where do you find the community?
|
||||
* Devices/chameleon-ultra for usage discussions
|
||||
* [GameTec_live discord server](https://discord.gg/DJ2A4wxncK)
|
||||
|
||||
###### Searching for the docs repo? Find it [here](https://github.com/RfidResearchGroup/ChameleonUltraDocs)
|
||||
###### Searching for the docs repo? Find it [here](https://github.com/RfidResearchGroup/ChameleonUltraDocs)
|
||||
|
||||
@@ -97,14 +97,21 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
FetchContent_Declare(
|
||||
pthreads4w
|
||||
GIT_REPOSITORY "https://github.com/GerHobbelt/pthread-win32"
|
||||
OVERRIDE_FIND_PACKAGE
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
find_package(pthreads4w CONFIG REQUIRED)
|
||||
set(LIBTHREAD pthreads4w::pthreadVC3)
|
||||
if(MSVC)
|
||||
# MSVC has no native POSIX threads; use pthreads4w
|
||||
FetchContent_Declare(
|
||||
pthreads4w
|
||||
GIT_REPOSITORY "https://github.com/GerHobbelt/pthread-win32"
|
||||
OVERRIDE_FIND_PACKAGE
|
||||
EXCLUDE_FROM_ALL
|
||||
)
|
||||
find_package(pthreads4w CONFIG REQUIRED)
|
||||
set(LIBTHREAD pthreads4w::pthreadVC3)
|
||||
else()
|
||||
# MinGW/MSYS2 ships with winpthreads; use native threads
|
||||
find_package(Threads REQUIRED)
|
||||
set(LIBTHREAD Threads::Threads)
|
||||
endif()
|
||||
|
||||
set(LIBMATH "") # No separate math library needed on Windows
|
||||
else()
|
||||
|
||||
Reference in New Issue
Block a user