1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00

Windows build corrections

This commit is contained in:
f4exb 2017-10-22 21:02:19 +02:00
parent c86cea5cbb
commit 355bff2a8c
5 changed files with 9 additions and 6 deletions

View File

@ -17,8 +17,8 @@ CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug CONFIG(Debug):build_subdir = debug
SOURCES += main.cpp SOURCES += main.cpp
LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):CONFIG += mobility
CONFIG(ANDROID):MOBILITY = CONFIG(ANDROID):MOBILITY =

View File

@ -18,6 +18,7 @@ QMAKE_CXXFLAGS += -msse4.1
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../sdrgui
CONFIG(Release):build_subdir = release CONFIG(Release):build_subdir = release

View File

@ -8,13 +8,13 @@ QT += core gui multimedia opengl
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TEMPLATE = lib TEMPLATE = lib
TARGET = sdrbase TARGET = sdrgui
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
INCLUDEPATH += ../sdrbase
DEFINES += USE_KISSFFT=1 DEFINES += USE_KISSFFT=1
win32 { win32 {
DEFINES += __WINDOWS__=1 DEFINES += __WINDOWS__=1
DEFINES += DSD_USE_SERIALDV=1
} }
DEFINES += USE_SSE2=1 DEFINES += USE_SSE2=1
QMAKE_CXXFLAGS += -msse2 QMAKE_CXXFLAGS += -msse2
@ -115,8 +115,6 @@ HEADERS += mainwindow.h\
gui/transverterdialog.h\ gui/transverterdialog.h\
gui/valuedial.h\ gui/valuedial.h\
gui/valuedialz.h\ gui/valuedialz.h\
dsp/devicesamplesource.h\
dsp/devicesamplesink.h\
plugin/pluginapi.h\ plugin/pluginapi.h\
plugin/pluginmanager.h plugin/pluginmanager.h
@ -137,6 +135,8 @@ FORMS += mainwindow.ui\
gui/transverterdialog.ui\ gui/transverterdialog.ui\
mainwindow.ui mainwindow.ui
LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
RESOURCES = resources/res.qrc RESOURCES = resources/res.qrc
CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):CONFIG += mobility

View File

@ -6,7 +6,8 @@ SET libzlib1dir="D:\softs\zlib-1.2.5"
copy app\%1\sdrangel.exe %2 copy app\%1\sdrangel.exe %2
copy sdrbase\%1\sdrbase.dll %2 copy sdrbase\%1\sdrbase.dll %2
copy devices\%1\devices.dll %2 copy sdrgui\%1\sdrgui.dll %2
copy devices\%1\devices.dll %2
copy mbelib\%1\mbelib.dll %2 copy mbelib\%1\mbelib.dll %2
copy dsdcc\%1\dsdcc.dll %2 copy dsdcc\%1\dsdcc.dll %2
copy serialdv\%1\serialdv.dll %2 copy serialdv\%1\serialdv.dll %2

View File

@ -24,6 +24,7 @@ copy "%msys2dir%\mingw64\bin\libwinpthread-1.dll" %2
copy %msys2dir%\mingw64\bin\libgraphite2.dll %2 copy %msys2dir%\mingw64\bin\libgraphite2.dll %2
copy app\%1\sdrangel.exe %2 copy app\%1\sdrangel.exe %2
copy sdrbase\%1\sdrbase.dll %2 copy sdrbase\%1\sdrbase.dll %2
copy sdrgui\%1\sdrgui.dll %2
copy devices\%1\devices.dll %2 copy devices\%1\devices.dll %2
copy cm256cc\%1\cm256cc.dll %2 copy cm256cc\%1\cm256cc.dll %2
copy mbelib\%1\mbelib.dll %2 copy mbelib\%1\mbelib.dll %2