From aab093dbc5db283f8f36de08013c5d158d789a29 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 13 Feb 2018 14:25:32 +0100 Subject: [PATCH] Windows build: compilable libperseus --- libperseus/config.h | 1 + libperseus/config.windows.h | 136 ++++++++++++++++++++++++++++++++++++ libperseus/libperseus.pro | 41 +++++++++++ sdrangel.windows.pro | 1 + 4 files changed, 179 insertions(+) create mode 100644 libperseus/config.windows.h create mode 100644 libperseus/libperseus.pro diff --git a/libperseus/config.h b/libperseus/config.h index 4fdefec3a..7a6e0f771 100644 --- a/libperseus/config.h +++ b/libperseus/config.h @@ -1,4 +1,5 @@ #ifdef WIN32 +#include "config.windows.h" #else #include "config.linux.h" #endif diff --git a/libperseus/config.windows.h b/libperseus/config.windows.h new file mode 100644 index 000000000..00936d277 --- /dev/null +++ b/libperseus/config.windows.h @@ -0,0 +1,136 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `dl' library (-ldl). */ +#define HAVE_LIBDL 1 + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `usb-1.0' library (-lusb-1.0). */ +#define HAVE_LIBUSB_1_0 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBUSB_1_0_LIBUSB_H */ + +/* Define to 1 if you have the `libusb_strerror' function. */ +#define HAVE_LIBUSB_STRERROR 1 + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Linux backend */ +#define OS_LINUX 1 + +/* Windows backend */ +/* #undef OS_WINDOWS */ + +/* Name of package */ +#define PACKAGE "libperseus_sdr" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "andrew@montefusco.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libperseus_sdr" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libperseus_sdr 0.7.5.4-af9f" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libperseus_sdr" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.7.5.4-af9f" + +/* type of second poll() argument */ +/* #undef POLL_NFDS_TYPE */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define VERSION "0.7.5.4-af9f" + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to the type of a signed integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int16_t */ + +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int32_t */ + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ + +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +/* #undef volatile */ diff --git a/libperseus/libperseus.pro b/libperseus/libperseus.pro new file mode 100644 index 000000000..e3cf9c2b3 --- /dev/null +++ b/libperseus/libperseus.pro @@ -0,0 +1,41 @@ +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +QT += core + +TEMPLATE = lib +TARGET = libperseus + +DEFINES += HAVE_CONFIG_H=1 + +CONFIG(MINGW32):LIBPERSEUSSRC = "D:\softs\libperseus-sdr" +CONFIG(MINGW64):LIBPERSEUSSRC = "D:\softs\libperseus-sdr" +INCLUDEPATH += $$LIBPERSEUSSRC/src + +CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" +CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" + +SOURCES = fpga_data.c\ + $$LIBPERSEUSSRC/fifo.c\ + $$LIBPERSEUSSRC/perseuserr.c\ + $$LIBPERSEUSSRC/perseusfx2.c\ + $$LIBPERSEUSSRC/perseus-in.c\ + $$LIBPERSEUSSRC/perseus-sdr.c + +HEADERS = fpga_data.h\ + config.h\ + config.windows.h\ + $$LIBPERSEUSSRC/fifo.h\ + $$LIBPERSEUSSRC/perseuserr.h\ + $$LIBPERSEUSSRC/perseusfx2.h\ + $$LIBPERSEUSSRC/perseus-in.h\ + $$LIBPERSEUSSRC/perseus-sdr.h + +CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 + +CONFIG(ANDROID):CONFIG += mobility +CONFIG(ANDROID):MOBILITY = diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index c228d2ea2..13d93bd8e 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -23,6 +23,7 @@ SUBDIRS += libbladerf SUBDIRS += libhackrf SUBDIRS += libiio SUBDIRS += liblimesuite +SUBDIRS += libperseus SUBDIRS += librtlsdr SUBDIRS += libsqlite3 SUBDIRS += devices