Final tidying for Windows Builld

merge-requests/16/head
Phil Taylor 2023-01-30 21:43:47 +00:00
rodzic 28c9d1beb2
commit 63a7ec0a21
1 zmienionych plików z 19 dodań i 19 usunięć

Wyświetl plik

@ -27,14 +27,14 @@ DEFINES += BUILD_WFVIEW
CONFIG(debug, release|debug) {
# For Debug builds only:
QMAKE_CXXFLAGS += -faligned-new
linux:QMAKE_CXXFLAGS += -faligned-new
win32:DESTDIR = wfview-release
} else {
# For Release builds only:
linux:QMAKE_CXXFLAGS += -s
QMAKE_CXXFLAGS += -fvisibility=hidden
QMAKE_CXXFLAGS += -fvisibility-inlines-hidden
QMAKE_CXXFLAGS += -faligned-new
linux:QMAKE_CXXFLAGS += -fvisibility=hidden
linux:QMAKE_CXXFLAGS += -fvisibility-inlines-hidden
linux:QMAKE_CXXFLAGS += -faligned-new
linux:QMAKE_LFLAGS += -O2 -s
win32:DESTDIR = wfview-debug
}
@ -144,9 +144,9 @@ CONFIG(debug, release|debug) {
contains(QMAKE_TARGET.arch, x86_64) {
LIBS += -L../opus/win32/VS2015/x64/Debug/
LIBS += -L../qcustomplot/x64
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll debug\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll debug\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\X64\Debug\hidapi.dll release\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll wfview-debug $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\X64\Debug\hidapi.dll wfview-debug $$escape_expand(\\n\\t))
win32:LIBS += -L../portaudio/msvc/X64/Debug/ -lportaudio_x64
contains(DEFINES,USB_CONTROLLER){
win32:LIBS += -L../hidapi/windows/x64/debug -lhidapi
@ -154,10 +154,10 @@ CONFIG(debug, release|debug) {
} else {
LIBS += -L../opus/win32/VS2015/win32/Debug/
LIBS += -L../qcustomplot/win32
QMAKE_POST_LINK +=$$quote(cmd /c copy /y .\qcustomplot\win32\qcustomplotd2.dll debug\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Debug\portaudio_x86.dll debug\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\Debug\hidapi.dll release\$$escape_expand(\n\t))
win32:LIBS += -L../portaudio/msvc/Win32/Debug/ -lportaudio_x86 -lole32
QMAKE_POST_LINK +=$$quote(cmd /c copy /y .\qcustomplot\win32\qcustomplotd2.dll wfview-debug $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Debug\portaudio_x86.dll wfview-debug\$$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\Debug\hidapi.dll wfview-debug $$escape_expand(\\n\\t))
win32:LIBS += -L../portaudio/msvc/Win32/Debug/ -lportaudio_x86
contains(DEFINES,USB_CONTROLLER){
win32:LIBS += -L../hidapi/windows/debug -lhidapi
}
@ -170,9 +170,9 @@ CONFIG(debug, release|debug) {
contains(QMAKE_TARGET.arch, x86_64) {
LIBS += -L../opus/win32/VS2015/x64/Release/
LIBS += -L../qcustomplot/x64
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplot2.dll release\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll release\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\X64\Release\hidapi.dll release\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplot2.dll wfview-release $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\X64\Release\hidapi.dll wfview-release $$escape_expand(\\n\\t))
win32:LIBS += -L../portaudio/msvc/X64/Release/ -lportaudio_x64
contains(DEFINES,USB_CONTROLLER){
win32:LIBS += -L../hidapi/windows/x64/release -lhidapi
@ -180,10 +180,10 @@ CONFIG(debug, release|debug) {
} else {
LIBS += -L../opus/win32/VS2015/win32/Release/
LIBS += -L../qcustomplot/win32
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\win32\qcustomplot2.dll release\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Release\portaudio_x86.dll release\$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\Release\hidapi.dll release\$$escape_expand(\n\t))
win32:LIBS += -L../portaudio/msvc/Win32/Release/ -lportaudio_x86 -lole32
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\win32\qcustomplot2.dll wfview-release $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Release\portaudio_x86.dll wfview-release $$escape_expand(\\n\\t))
QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\hidapi\windows\Release\hidapi.dll wfview-release $$escape_expand(\\n\\t))
win32:LIBS += -L../portaudio/msvc/Win32/Release/ -lportaudio_x86
contains(DEFINES,USB_CONTROLLER){
win32:LIBS += -L../hidapi/windows/release -lhidapi
}
@ -198,7 +198,7 @@ contains(DEFINES,USB_CONTROLLER){
}
!win32:LIBS += -L./ -l$$QCPLIB -lopus
win32:LIBS += -l$$QCPLIB -lopus
win32:LIBS += -l$$QCPLIB -lopus -lole32
#macx:SOURCES += ../qcustomplot/qcustomplot.cpp