From 27b6aab5f7219392f6d042ff3224840b57da3e87 Mon Sep 17 00:00:00 2001 From: Edouard Griffiths Date: Sun, 27 Mar 2016 18:56:33 +0200 Subject: [PATCH] Windows build: added possibility to build with MinGW64 (experimental, does not work) --- fcdhid/fcdhid.pro | 4 ++++ fcdlib/fcdlib.pro | 2 ++ libairspy/libairspy.pro | 3 +++ libbladerf/libbladerf.pro | 5 +++++ libhackrf/libhackrf.pro | 3 +++ librtlsdr/librtlsdr.pro | 3 +++ plugins/channel/chanalyzer/chanalyzer.pro | 1 + plugins/channel/demodbfm/demodbfm.pro | 1 + plugins/samplesource/airspy/airspy.pro | 1 + plugins/samplesource/bladerf/bladerf.pro | 1 + plugins/samplesource/hackrf/hackrf.pro | 1 + plugins/samplesource/rtlsdr/rtlsdr.pro | 1 + sdrbase/sdrbase.pro | 1 + 13 files changed, 27 insertions(+) diff --git a/fcdhid/fcdhid.pro b/fcdhid/fcdhid.pro index aa52fff72..787750f7f 100644 --- a/fcdhid/fcdhid.pro +++ b/fcdhid/fcdhid.pro @@ -12,6 +12,9 @@ TARGET = fcdhid CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include" CONFIG(MINGW32):DEFINES += MINGW32=1 +CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include" +CONFIG(MINGW64):DEFINES += MINGW32=1 + SOURCES = $$PWD/hid-libusb.c\ $$PWD/fcdhid.c @@ -20,3 +23,4 @@ HEADERS = $$PWD/fcdhid.h\ $$PWD/hidapi.h CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 -liconv +CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 -liconv diff --git a/fcdlib/fcdlib.pro b/fcdlib/fcdlib.pro index dc7489b95..e78a7e5fa 100644 --- a/fcdlib/fcdlib.pro +++ b/fcdlib/fcdlib.pro @@ -10,6 +10,7 @@ TEMPLATE = lib TARGET = fcdlib CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include" +CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include" SOURCES = $$PWD/fcdtraits.cpp\ $$PWD/fcdproplusconst.cpp\ @@ -20,3 +21,4 @@ HEADERS = $$PWD/fcdtraits.h\ $$PWD/fcdproconst.h CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 diff --git a/libairspy/libairspy.pro b/libairspy/libairspy.pro index 028a343ec..a427c505e 100644 --- a/libairspy/libairspy.pro +++ b/libairspy/libairspy.pro @@ -10,9 +10,11 @@ TEMPLATE = lib TARGET = libairspy CONFIG(MINGW32):LIBAIRSPYSRC = "D:\softs\libairspy\libairspy" +CONFIG(MINGW64):LIBAIRSPYSRC = "D:\softs\libairspy\libairspy" INCLUDEPATH += $$LIBAIRSPYSRC/src CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" SOURCES = $$LIBAIRSPYSRC/src/airspy.c\ $$LIBAIRSPYSRC/src/iqconverter_float.c\ @@ -25,6 +27,7 @@ HEADERS = $$LIBAIRSPYSRC/src/airspy.h\ $$LIBAIRSPYSRC/src/filters.h CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/libbladerf/libbladerf.pro b/libbladerf/libbladerf.pro index f1d1c5ca9..f65cea44f 100644 --- a/libbladerf/libbladerf.pro +++ b/libbladerf/libbladerf.pro @@ -12,6 +12,9 @@ TARGET = libbladerf CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF" CONFIG(MINGW32):LIBBLADERFCOMMONSRC = "D:\softs\bladeRF\host\common" CONFIG(MINGW32):LIBBLADERFLIBSRC = "D:\softs\bladeRF\host\libraries\libbladeRF" +CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF" +CONFIG(MINGW64):LIBBLADERFCOMMONSRC = "D:\softs\bladeRF\host\common" +CONFIG(MINGW64):LIBBLADERFLIBSRC = "D:\softs\bladeRF\host\libraries\libbladeRF" INCLUDEPATH += $$LIBBLADERFLIBSRC/include INCLUDEPATH += $$LIBBLADERFLIBSRC/src INCLUDEPATH += $$LIBBLADERFSRC/firmware_common @@ -21,6 +24,7 @@ INCLUDEPATH += $$LIBBLADERFCOMMONSRC/include/windows INCLUDEPATH += $$PWD/include CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" SOURCES = $$LIBBLADERFLIBSRC/src/async.c\ $$LIBBLADERFLIBSRC/src/bladerf_priv.c\ @@ -91,6 +95,7 @@ HEADERS = $$LIBBLADERFLIBSRC/src/async.h\ $$PWD/include/version.h CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/libhackrf/libhackrf.pro b/libhackrf/libhackrf.pro index 104d90973..9964eda09 100644 --- a/libhackrf/libhackrf.pro +++ b/libhackrf/libhackrf.pro @@ -10,15 +10,18 @@ TEMPLATE = lib TARGET = libhackrf CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host\libhackrf" +CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host\libhackrf" INCLUDEPATH += $$LIBHACKRFSRC/src CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" SOURCES = $$LIBHACKRFSRC/src/hackrf.c HEADERS = $$LIBHACKRFSRC/src/hackrf.h CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/librtlsdr/librtlsdr.pro b/librtlsdr/librtlsdr.pro index 8d77ccf19..794d059da 100644 --- a/librtlsdr/librtlsdr.pro +++ b/librtlsdr/librtlsdr.pro @@ -10,9 +10,11 @@ TEMPLATE = lib TARGET = librtlsdr CONFIG(MINGW32):LIBRTLSDRSRC = "D:\softs\librtlsdr" +CONFIG(MINGW64):LIBRTLSDRSRC = "D:\softs\librtlsdr" INCLUDEPATH += $$LIBRTLSDRSRC/include CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\ $$LIBRTLSDRSRC/src/tuner_e4k.c\ @@ -27,6 +29,7 @@ HEADERS = $$LIBRTLSDRSRC/include/rtl-sdr.h\ $$LIBRTLSDRSRC/src/getopt/getopt.h CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/plugins/channel/chanalyzer/chanalyzer.pro b/plugins/channel/chanalyzer/chanalyzer.pro index f2e38445c..6d07f5aa6 100644 --- a/plugins/channel/chanalyzer/chanalyzer.pro +++ b/plugins/channel/chanalyzer/chanalyzer.pro @@ -15,6 +15,7 @@ INCLUDEPATH += ../../../sdrbase CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug diff --git a/plugins/channel/demodbfm/demodbfm.pro b/plugins/channel/demodbfm/demodbfm.pro index df2f79797..8d2dc2a65 100644 --- a/plugins/channel/demodbfm/demodbfm.pro +++ b/plugins/channel/demodbfm/demodbfm.pro @@ -15,6 +15,7 @@ INCLUDEPATH += ../../../sdrbase CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug diff --git a/plugins/samplesource/airspy/airspy.pro b/plugins/samplesource/airspy/airspy.pro index 8b3f80c7c..a75e72bb1 100644 --- a/plugins/samplesource/airspy/airspy.pro +++ b/plugins/samplesource/airspy/airspy.pro @@ -12,6 +12,7 @@ QT += core gui widgets multimedia TARGET = inputairspy CONFIG(MINGW32):LIBAIRSPYSRC = "D:\softs\libairspy" +CONFIG(MINGW64):LIBAIRSPYSRC = "D:\softs\libairspy" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../sdrbase INCLUDEPATH += $$LIBAIRSPYSRC diff --git a/plugins/samplesource/bladerf/bladerf.pro b/plugins/samplesource/bladerf/bladerf.pro index de61064bd..29eade701 100644 --- a/plugins/samplesource/bladerf/bladerf.pro +++ b/plugins/samplesource/bladerf/bladerf.pro @@ -12,6 +12,7 @@ QT += core gui widgets multimedia TARGET = inputbladerf CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" +CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../sdrbase INCLUDEPATH += $$LIBBLADERFSRC diff --git a/plugins/samplesource/hackrf/hackrf.pro b/plugins/samplesource/hackrf/hackrf.pro index b0220b7d5..6841e47ed 100644 --- a/plugins/samplesource/hackrf/hackrf.pro +++ b/plugins/samplesource/hackrf/hackrf.pro @@ -12,6 +12,7 @@ QT += core gui widgets multimedia TARGET = inputhackrf CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" +CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../sdrbase INCLUDEPATH += $$LIBHACKRFSRC diff --git a/plugins/samplesource/rtlsdr/rtlsdr.pro b/plugins/samplesource/rtlsdr/rtlsdr.pro index 03f2fedb1..4d5211b5d 100644 --- a/plugins/samplesource/rtlsdr/rtlsdr.pro +++ b/plugins/samplesource/rtlsdr/rtlsdr.pro @@ -12,6 +12,7 @@ QT += core gui widgets multimedia TARGET = inputrtlsdr CONFIG(MINGW32):LIBRTLSDRSRC = "D:\softs\librtlsdr" +CONFIG(MINGW64):LIBRTLSDRSRC = "D:\softs\librtlsdr" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../sdrbase INCLUDEPATH += $$LIBRTLSDRSRC/include diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index 4dd250a25..db0d6390f 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -15,6 +15,7 @@ DEFINES += USE_KISSFFT=1 CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" SOURCES += mainwindow.cpp\ audio/audiodeviceinfo.cpp\