Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #343 from mrbubble62/master

Browse Source 
build hackrf_sweep on Windows
This commit is contained in:
Michael Ossmann
2017-02-15 14:47:44 -07:00
committed by GitHub
parent db47032592 1ba64c674c
commit 0f6cc649d1
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
host/README.md
View File

@ -63,11 +63,16 @@ make install
###For Visual Studio 2015 x64 ###For Visual Studio 2015 x64
``` ```
c:\hackrf\host\build> cmake ../ -G "Visual Studio 14 2015 Win64" \ c:\hackrf\host\build> cmake ../ -G "Visual Studio 14 2015 Win64" \
-DLIBUSB_INCLUDE_DIR=c:\libusb-1.0.18-win\include\libusb-1.0 \ -DLIBUSB_INCLUDE_DIR=c:\libusb-1.0.21\libusb \
-DLIBUSB_LIBRARIES=c:\libusb-1.0.18-win\MS64\static\libusb-1.0.lib \ -DLIBUSB_LIBRARIES=c:\libusb-1.0.21\x64\Release\lib\libusb-1.0.lib \
-DTHREADS_PTHREADS_INCLUDE_DIR=c:\pthreads-w32-2-9-1-release\Pre-built.2\include \ -DTHREADS_PTHREADS_INCLUDE_DIR=c:\pthreads-w32-2-9-1-release\Pre-built.2\include \
-DTHREADS_PTHREADS_WIN32_LIBRARY=c:\pthreads-w32-2-9-1-release\Pre-built.2\lib\x64\pthreadVC2.lib -DTHREADS_PTHREADS_WIN32_LIBRARY=c:\pthreads-w32-2-9-1-release\Pre-built.2\lib\x64\pthreadVC2.lib \
-DFFTW_INCLUDES=C:\hackrf-2017.02.1\host\hackrf-tools\fftw-3.3.5-dll64 \
-DFFTW_LIBRARIES=C:\hackrf-2017.02.1\host\hackrf-tools\fftw-3.3.5-dll64\libfftw3f-3.lib
``` ```
unpack precompiled fftw-3.3.5-dll64.zip from http://www.fftw.org/install/windows.html to C:\hackrf-2017.02.1\host\hackrf-tools\fftw-3.3.5-dll64
Create library from VS command shell
C:\hackrf-2017.02.1\host\hackrf-tools\fftw-3.3.5-dll6> lib /machine:x64 /def:libfftw3f-3.def
Cmake will produce a solution file named `hackrf_all.sln` and a series of Cmake will produce a solution file named `hackrf_all.sln` and a series of
project files which can be used with msbuild as follows: project files which can be used with msbuild as follows:

8
host/cmake/modules/FindFFTW.cmake
View File

@ -12,7 +12,15 @@ endif (FFTW_INCLUDES)
find_path (FFTW_INCLUDES fftw3.h) find_path (FFTW_INCLUDES fftw3.h)
IF (WIN32)
include_directories(${FFTW_INCLUDES})
find_library (FFTW_LIBRARIES NAMES ${FFTW_LIBRARIES})
ELSE(WIN32)
find_library (FFTW_LIBRARIES NAMES fftw3) find_library (FFTW_LIBRARIES NAMES fftw3)
ENDIF(WIN32)
# handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE

4
host/hackrf-tools/src/CMakeLists.txt
View File

@ -31,15 +31,17 @@ SET(TOOLS
hackrf_cpldjtag hackrf_cpldjtag
hackrf_info hackrf_info
hackrf_debug hackrf_debug
hackrf_sweep
) )
if(MSVC) if(MSVC)
add_library(libgetopt_static STATIC add_library(libgetopt_static STATIC
../getopt/getopt.c ../getopt/getopt.c
) )
LIST(APPEND TOOLS_LINK_LIBS ${FFTW_LIBRARIES})
include_directories(${FFTW_INCLUDES})
else() else()
pkg_check_modules(FFTW REQUIRED fftw3f) pkg_check_modules(FFTW REQUIRED fftw3f)
LIST(APPEND TOOLS hackrf_sweep)
LIST(APPEND TOOLS_LINK_LIBS m fftw3f) LIST(APPEND TOOLS_LINK_LIBS m fftw3f)
endif() endif()

6
host/hackrf-tools/src/hackrf_sweep.c
View File

@ -20,6 +20,7 @@
* the Free Software Foundation, Inc., 51 Franklin Street, * the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#define _USE_MATH_DEFINES
#include <hackrf.h> #include <hackrf.h>
@ -47,7 +48,6 @@ typedef int bool;
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#ifdef _WIN64 #ifdef _WIN64
@ -334,7 +334,11 @@ void sigint_callback_handler(int signum) {
int main(int argc, char** argv) { int main(int argc, char** argv) {
int opt, i, result = 0; int opt, i, result = 0;
#ifdef _WIN32
const char* path = "nul";
#else
const char* path = "/dev/null"; const char* path = "/dev/null";
#endif
const char* serial_number = NULL; const char* serial_number = NULL;
int exit_code = EXIT_SUCCESS; int exit_code = EXIT_SUCCESS;
struct timeval t_end; struct timeval t_end;