sdr
/
osmo-fl2k
8
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build with MinGW 

Signed-off-by: Steve Markgraf <steve@steve-m.de>
This commit is contained in:
Martin Hauke 2018-04-24 20:47:38 +02:00 committed by Steve Markgraf
parent 0d520ba113
commit 0325fa9496
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -60,7 +60,9 @@ endif()
######################################################################## ########################################################################
find_package(PkgConfig) find_package(PkgConfig)
find_package(LibUSB) find_package(LibUSB)
set(THREADS_USE_PTHREADS_WIN32 true) if(WIN32 AND NOT MINGW)
set(THREADS_USE_PTHREADS_WIN32 true)
endif()
find_package(Threads) find_package(Threads)
if(NOT LIBUSB_FOUND) if(NOT LIBUSB_FOUND)

9
src/CMakeLists.txt
View File

@ -61,7 +61,7 @@ endif()
######################################################################## ########################################################################
# Setup libraries used in executables # Setup libraries used in executables
######################################################################## ########################################################################
if(WIN32) if(WIN32 AND NOT MINGW)
add_library(libgetopt_static STATIC add_library(libgetopt_static STATIC
getopt/getopt.c getopt/getopt.c
) )
@ -105,7 +105,7 @@ target_link_libraries(fl2k_test m)
target_link_libraries(fl2k_fm m) target_link_libraries(fl2k_fm m)
endif() endif()
if(WIN32) if(WIN32 AND NOT MINGW)
target_link_libraries(fl2k_file libgetopt_static) target_link_libraries(fl2k_file libgetopt_static)
target_link_libraries(fl2k_tcp ws2_32 libgetopt_static) target_link_libraries(fl2k_tcp ws2_32 libgetopt_static)
target_link_libraries(fl2k_test libgetopt_static) target_link_libraries(fl2k_test libgetopt_static)
@ -115,6 +115,11 @@ set_property(TARGET fl2k_tcp APPEND PROPERTY COMPILE_DEFINITIONS "libosmo-fl2k_S
set_property(TARGET fl2k_test APPEND PROPERTY COMPILE_DEFINITIONS "libosmo-fl2k_STATIC" ) set_property(TARGET fl2k_test APPEND PROPERTY COMPILE_DEFINITIONS "libosmo-fl2k_STATIC" )
set_property(TARGET fl2k_fm APPEND PROPERTY COMPILE_DEFINITIONS "libosmo-fl2k_STATIC" ) set_property(TARGET fl2k_fm APPEND PROPERTY COMPILE_DEFINITIONS "libosmo-fl2k_STATIC" )
endif() endif()
if(MINGW)
target_link_libraries(fl2k_tcp ws2_32)
endif()
######################################################################## ########################################################################
# Install built library files & utilities # Install built library files & utilities
######################################################################## ########################################################################

6
src/rds_mod.c
View File

@ -109,7 +109,13 @@ int get_rds_ct_group(uint16_t *blocks)
utc = localtime(&now); utc = localtime(&now);
//'struct tm' has no member named 'tm_gmtoff' on Windows+MinGW
#if defined(__APPLE__) || defined(__FreeBSD__)
offset = utc->tm_gmtoff / (30 * 60); offset = utc->tm_gmtoff / (30 * 60);
#else
offset = time(NULL) / (30 * 60);
#endif
blocks[3] |= abs(offset); blocks[3] |= abs(offset);
if (offset < 0) if (offset < 0)
blocks[3] |= 0x20; blocks[3] |= 0x20;