Windows: MSVC2017: use default PothosSDR install directory

pull/263/head
f4exb 2018-11-16 10:47:30 +01:00
rodzic b0fa7c2591
commit 8e5a332b50
4 zmienionych plików z 9 dodań i 9 usunięć

Wyświetl plik

@ -61,7 +61,7 @@ MINGW32 || MINGW64 || macx {
}
MSVC {
INCLUDEPATH += "C:\Programs\PothosSDR\include"
INCLUDEPATH += "C:\Program Files\PothosSDR\include"
}
INCLUDEPATH += $$LIBPERSEUSSRC
@ -181,6 +181,6 @@ macx {
MSVC {
LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lLimeSuite
LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lSoapySDR
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lLimeSuite
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR
}

Wyświetl plik

@ -17,7 +17,7 @@ INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
INCLUDEPATH += "C:\Programs\PothosSDR\include"
INCLUDEPATH += "C:\Program Files\PothosSDR\include"
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -40,4 +40,4 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../swagger/$${build_subdir} -lswagger
LIBS += -L../../../devices/$${build_subdir} -ldevices
LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lSoapySDR
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR

Wyświetl plik

@ -17,7 +17,7 @@ INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../devices
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
INCLUDEPATH += "C:\Programs\PothosSDR\include"
INCLUDEPATH += "C:\Program Files\PothosSDR\include"
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -40,4 +40,4 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../swagger/$${build_subdir} -lswagger
LIBS += -L../../../devices/$${build_subdir} -ldevices
LIBS += -LC:\Programs\PothosSDR\bin -LC:\Programs\PothosSDR\lib -lSoapySDR
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR

Wyświetl plik

@ -3,7 +3,7 @@ SET opencvdir="C:\softs\opencv\build\mw32\install\x86\mingw\bin"
SET libxml2dir="C:\softs\libxml2-2.7.8.win32"
SET libiconvdir="C:\softs\iconv-1.9.2.win32"
SET libzlib1dir="C:\softs\zlib-1.2.5"
SET pothosdir="C:\Programs\PothosSDR"
SET pothosdir="C:\Program Files\PothosSDR"
SET pthreadsdir="C:\softs\pthreads-w32"
copy app\%1\sdrangel.exe %2
@ -27,7 +27,7 @@ copy libairspyhf\%1\libairspyhf.dll %2
REM copy libbladerf\%1\libbladerf.dll %2
REM copy libiio\%1\libiio.dll %2
copy %pothosdir%\bin\LimeSuite.dll %2
copy %pothosdir%\bin\SoapySDR.dll %2
REM copy %pothosdir%\bin\SoapySDR.dll %2
copy %libusbdir%\dll\libusb-1.0.dll %2
copy %pthreadsdir%\dll\x64\pthreadVC2.dll %2