From 60a1d405497e02bacbf2756fe96c11c99c6490fa Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Fri, 31 Dec 2021 00:30:22 +0000 Subject: [PATCH] Fixes to maintain QT6.2 support --- rigctld.cpp | 14 +- wfmain.cpp | 21 ++ wfmain.h | 2 + wfview.sln | 10 +- wfview.vcxproj | 422 ++++++++++++++++++++++++++++------------- wfview.vcxproj.filters | 262 +++++++++---------------- wfview_resource.rc | 9 +- 7 files changed, 429 insertions(+), 311 deletions(-) diff --git a/rigctld.cpp b/rigctld.cpp index 3426284..23d70ef 100644 --- a/rigctld.cpp +++ b/rigctld.cpp @@ -154,28 +154,28 @@ void rigCtlClient::socketReadyRead() return; } - if (commands[num] == ";" || commands[num] == "|" || commands[num] == ",") + if (commands[num] == QString(";") || commands[num] == QString("|") || commands[num] == QString(",")) { sep = commands[num].toLatin1(); num++; } - else if (commands[num] == "+") + else if (commands[num] == QString("+")) { longReply = true; sep = "\n"; num++; } - else if (commands[num] == "#") + else if (commands[num] == QString("#")) { continue; } - else if (commands[num].toLower() == "q") + else if (commands[num].toLower() == QString("q")) { closeSocket(); return; } - if (commands[num] == "\\") + if (commands[num] == QString("\\")) { num++; } @@ -183,7 +183,7 @@ void rigCtlClient::socketReadyRead() QStringList command = commands.mid(num).split(" "); - if (command[0] == 0xf0 || command[0] == "chk_vfo") + if (command[0] == QString((char)0xf0) || command[0] == "chk_vfo") { chkVfoEecuted = true; QString resp; @@ -1048,7 +1048,7 @@ void rigCtlClient::socketReadyRead() qInfo(logRigCtlD()) << "Setting:" << command[1] << command[2]; } - else if (command.length() > 0 && (command[0] == 0x88 || command[0] == "get_powerstat")) + else if (command.length() > 0 && (command[0] == QString((char)0x88) || command[0] == "get_powerstat")) { QString resp; diff --git a/wfmain.cpp b/wfmain.cpp index ea23594..87b01b0 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -1145,15 +1145,19 @@ void wfmain::setAudioDevicesUI() const auto audioOutputs = mediaDevices.audioOutputs(); for (const QAudioDevice& deviceInfo : audioOutputs) { ui->audioOutputCombo->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); + ui->serverTXAudioOutputCombo->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); } ui->audioInputCombo->clear(); const auto audioInputs = mediaDevices.audioInputs(); for (const QAudioDevice& deviceInfo : audioInputs) { ui->audioInputCombo->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); + ui->serverRXAudioInputCombo->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); } // Set these to default audio devices initially. rxSetup.port = QMediaDevices::defaultAudioOutput(); txSetup.port = QMediaDevices::defaultAudioInput(); + serverTxSetup.port = QMediaDevices::defaultAudioOutput(); + serverRxSetup.port = QMediaDevices::defaultAudioInput(); #endif #endif @@ -1658,11 +1662,16 @@ void wfmain::loadSettings() serverRxSetup.port = ui->audioOutputCombo->itemData(serverAudioInputIndex).toInt(); #else QVariant v = ui->serverRXAudioInputCombo->currentData(); +#if QT_VERSION >= 0x060000 + serverRxSetup.port = v.value(); +#else serverRxSetup.port = v.value(); +#endif #endif } ui->serverRXAudioInputCombo->blockSignals(false); + serverRxSetup.resampleQuality = settings->value("ResampleQuality", "4").toInt(); serverRxSetup.resampleQuality = rxSetup.resampleQuality; @@ -1678,7 +1687,11 @@ void wfmain::loadSettings() serverTxSetup.port = ui->serverTXAudioOutputCombo->itemData(serverAudioOutputIndex).toInt(); #else QVariant v = ui->serverTXAudioOutputCombo->currentData(); +#if QT_VERSION >= 0x060000 + serverRxSetup.port = v.value(); +#else serverRxSetup.port = v.value(); +#endif #endif } ui->serverTXAudioOutputCombo->blockSignals(false); @@ -1830,7 +1843,11 @@ void wfmain::on_serverRXAudioInputCombo_currentIndexChanged(int value) serverRxSetup.port = ui->serverRXAudioInputCombo->itemData(value).toInt(); #else QVariant v = ui->serverRXAudioInputCombo->itemData(value); +#if QT_VERSION < 0x060000 serverRxSetup.port = v.value(); +#else + serverRxSetup.port = v.value(); +#endif #endif serverRxSetup.name = ui->serverRXAudioInputCombo->itemText(value); qDebug(logGui()) << "Changed default server audio input to:" << serverRxSetup.name; @@ -1844,7 +1861,11 @@ void wfmain::on_serverTXAudioOutputCombo_currentIndexChanged(int value) serverTxSetup.port = ui->serverTXAudioOutputCombo->itemData(value).toInt(); #else QVariant v = ui->serverTXAudioOutputCombo->itemData(value); +#if QT_VERSION < 0x060000 serverTxSetup.port = v.value(); +#else + serverTxSetup.port = v.value(); +#endif #endif serverTxSetup.name = ui->serverTXAudioOutputCombo->itemText(value); qDebug(logGui()) << "Changed default server audio output to:" << serverTxSetup.name; diff --git a/wfmain.h b/wfmain.h index a5c3c10..b4d4c50 100644 --- a/wfmain.h +++ b/wfmain.h @@ -867,7 +867,9 @@ private: unsigned int tsKnobHz; rigstate* rigState = Q_NULLPTR; +#if QT_VERSION >= 0x060000 QMediaDevices mediaDevices; +#endif SERVERCONFIG serverConfig; void serverAddUserLine(const QString& user, const QString& pass, const int& type); diff --git a/wfview.sln b/wfview.sln index ff4a8cd..54a9da1 100644 --- a/wfview.sln +++ b/wfview.sln @@ -7,12 +7,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wfview", "wfview.vcxproj", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x86.ActiveCfg = Debug|Win32 - {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x86.Build.0 = Debug|Win32 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x64.ActiveCfg = Debug|x64 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x64.Build.0 = Debug|x64 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x86.ActiveCfg = Debug|x64 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x86.Build.0 = Debug|x64 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x64.ActiveCfg = Release|x64 + {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x64.Build.0 = Release|x64 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x86.ActiveCfg = Release|Win32 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x86.Build.0 = Release|Win32 EndGlobalSection diff --git a/wfview.vcxproj b/wfview.vcxproj index 21e1461..3a7a67c 100644 --- a/wfview.vcxproj +++ b/wfview.vcxproj @@ -1,13 +1,13 @@  - + Release - Win32 + x64 - + Debug - Win32 + x64 @@ -16,10 +16,9 @@ QtVS_v304 10.0.19041.0 10.0.19041.0 - $(MSBuildProjectDirectory)\QtMsBuild - + $(MSBuildProjectDirectory)\QtMsBuild - + v142 release\ false @@ -28,7 +27,7 @@ release\ wfview - + v142 debug\ false @@ -37,71 +36,42 @@ debug\ wfview - - - - + - + - + - - - - - - debug\ - debug\ - wfview - true - - - release\ - release\ - wfview - true - false - - - msvc2019 - core;network;gui;multimedia;widgets;serialport;printsupport - - - msvc2019 - core;network;gui;multimedia;widgets;serialport;printsupport - - - - - + debug\debug\wfviewtruetruerelease\release\wfviewtruefalsetruemsvc2019_64_v62core;network;gui;multimedia;widgets;serialport;printsupportmsvc2019_64_v62core;network;gui;multimedia;widgets;serialport;printsupport + + .;..\qcustomplot;..\opus\include;resampler;release;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) release\ false None 4577;4467;%(DisableSpecificWarnings) Sync + stdcpp17 release\ MaxSpeed - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="62771f6";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION="1.2d";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="2a0b794";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) false - - + MultiThreadedDLL true true Level3 - true - + true - ..\opus\win32\VS2015\Win32\Release\opus.lib;shell32.lib;%(AdditionalDependencies) - ..\opus\win32\VS2015\Win32\Release;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) + ..\qcustomplot\qcustomplot2.lib;..\opus\win32\VS2015\x64\Release\opus.lib;$(QTDIR)\lib\Qt6Multimedia.lib;$(QTDIR)\lib\Qt6PrintSupport.lib;$(QTDIR)\lib\Qt6Widgets.lib;$(QTDIR)\lib\Qt6Gui.lib;$(QTDIR)\lib\Qt6SerialPort.lib;$(QTDIR)\lib\Qt6Network.lib;$(QTDIR)\lib\Qt6Core.lib;$(QTDIR)\lib\Qt6EntryPoint.lib;shell32.lib;%(AdditionalDependencies) + ..\opus\win32\VS2015\x64\Release;..\qcustomplot;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true + true false true false @@ -117,50 +87,35 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"62771f6\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION=\"1.2d\";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"2a0b794\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) - - msvc - ./$(Configuration)/moc_predefs.h - Moc'ing %(Identity)... - output - $(Configuration) - moc_%(Filename).cpp - - - default - Rcc'ing %(Identity)... - $(Configuration) - qrc_%(Filename).cpp - - - Uic'ing %(Identity)... - $(ProjectDir) - ui_%(Filename).h - - - + + copy /Y ..\qcustomplot\qcustomplot2.dll release + copy /Y ..\qcustomplot\qcustomplot2.dll release + + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h + .;..\qcustomplot;..\opus\include;resampler;debug;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) debug\ false ProgramDatabase 4577;4467;%(DisableSpecificWarnings) Sync + stdcpp17 debug\ Disabled - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="62771f6";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION="1.2d";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="2a0b794";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions) false MultiThreadedDebugDLL true true Level3 - true - + true - ..\opus\win32\VS2015\Win32\Debug\opus.lib;shell32.lib;%(AdditionalDependencies) - ..\opus\win32\VS2015\Win32\Debug;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) + ..\qcustomplot\qcustomplotd2.lib;..\opus\win32\VS2015\x64\Debug\opus.lib;$(QTDIR)\lib\Qt6Multimediad.lib;$(QTDIR)\lib\Qt6PrintSupportd.lib;$(QTDIR)\lib\Qt6Widgetsd.lib;$(QTDIR)\lib\Qt6Guid.lib;$(QTDIR)\lib\Qt6SerialPortd.lib;$(QTDIR)\lib\Qt6Networkd.lib;$(QTDIR)\lib\Qt6Cored.lib;$(QTDIR)\lib\Qt6EntryPointd.lib;shell32.lib;%(AdditionalDependencies) + ..\opus\win32\VS2015\x64\Debug;..\qcustomplot;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true true @@ -176,28 +131,13 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"62771f6\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION=\"1.2d\";QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"2a0b794\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) - - msvc - ./$(Configuration)/moc_predefs.h - Moc'ing %(Identity)... - output - $(Configuration) - moc_%(Filename).cpp - - - default - Rcc'ing %(Identity)... - $(Configuration) - qrc_%(Filename).cpp - - - Uic'ing %(Identity)... - $(ProjectDir) - ui_%(Filename).h - - + + copy /Y ..\qcustomplot\qcustomplotd2.dll debug + copy /Y ..\qcustomplot\qcustomplotd2.dll debug + + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h @@ -208,7 +148,6 @@ - @@ -220,89 +159,307 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + Document - true - $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) - cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -faligned-new -Zi -MDd -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h - Generate moc_predefs.h - debug\moc_predefs.h;%(Outputs) + true + $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -faligned-new -Zi -MDd -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h + Generate moc_predefs.h + debug\moc_predefs.h;%(Outputs) Document - $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) - cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -fvisibility=hidden -fvisibility-inlines-hidden -faligned-new -O2 -MD -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h - Generate moc_predefs.h - release\moc_predefs.h;%(Outputs) - true + $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -fvisibility=hidden -fvisibility-inlines-hidden -faligned-new -O2 -MD -std:c++17 -utf-8 -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h + Generate moc_predefs.h + release\moc_predefs.h;%(Outputs) + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -336,16 +493,30 @@ - resources - resources - + + + + + + + + + + resourcesresources - style - style - + + + + + + + + + + stylestyle @@ -364,9 +535,6 @@ - - - - + \ No newline at end of file diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters index 14578d6..dc4fb83 100644 --- a/wfview.vcxproj.filters +++ b/wfview.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -122,238 +122,156 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - - + + Header Files - + Header Files Header Files - + Header Files - + Header Files - + Header Files - - + + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - - + + Header Files - + Header Files Header Files - + Header Files - + Header Files - + Header Files - - + + Header Files - - + + Header Files - + Header Files - + Header Files - + - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - + + + + + + + + + + Generated Files Generated Files - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - - - Generated Files - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Form Files - - + + Form Files - - + + Form Files - - + + Form Files - - + + Form Files - - + + Form Files - - + + Form Files - + @@ -443,9 +361,9 @@ Resource Files - + Resource Files - + Resource Files @@ -455,9 +373,9 @@ Resource Files - + Resource Files - + Resource Files diff --git a/wfview_resource.rc b/wfview_resource.rc index 6ccdf69..75dc080 100644 --- a/wfview_resource.rc +++ b/wfview_resource.rc @@ -1,6 +1,6 @@ #include -IDI_ICON1 ICON DISCARDABLE "C:\\Users\\Phil\\source\\repos\\wfview\\resources\\wfview.ico" +IDI_ICON1 ICON "C:\\Users\\Phil\\source\\repos\\wfview\\resources\\wfview.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION 0,0,0,0 @@ -11,9 +11,9 @@ VS_VERSION_INFO VERSIONINFO #else FILEFLAGS 0x0L #endif - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL - FILESUBTYPE 0x0L + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN @@ -26,6 +26,9 @@ VS_VERSION_INFO VERSIONINFO VALUE "OriginalFilename", "wfview.exe\0" VALUE "ProductName", "wfview\0" VALUE "ProductVersion", "0.0.0.0\0" + VALUE "InternalName", "\0" + VALUE "Comments", "\0" + VALUE "LegalTrademarks", "\0" END END BLOCK "VarFileInfo"