From 70fe1732fe83c910bb1b02c5c7ad7b923dc40a19 Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Tue, 18 May 2021 17:51:20 +0100 Subject: [PATCH] Various file tidying for Windows/Mac builds --- Info.plist => resources/Info.plist | 0 .../wfview.entitlements | 0 wfview.icns => resources/wfview.icns | Bin resources/wfview.ico | Bin 0 -> 75702 bytes wfview.pro | 22 +- wfview.vcxproj | 617 +++++++++--------- wfview.vcxproj.filters | 210 +++--- wfview_resource.rc | 37 ++ 8 files changed, 462 insertions(+), 424 deletions(-) rename Info.plist => resources/Info.plist (100%) rename wfview.entitlements => resources/wfview.entitlements (100%) rename wfview.icns => resources/wfview.icns (100%) create mode 100644 resources/wfview.ico create mode 100644 wfview_resource.rc diff --git a/Info.plist b/resources/Info.plist similarity index 100% rename from Info.plist rename to resources/Info.plist diff --git a/wfview.entitlements b/resources/wfview.entitlements similarity index 100% rename from wfview.entitlements rename to resources/wfview.entitlements diff --git a/wfview.icns b/resources/wfview.icns similarity index 100% rename from wfview.icns rename to resources/wfview.icns diff --git a/resources/wfview.ico b/resources/wfview.ico new file mode 100644 index 0000000000000000000000000000000000000000..cd12f136a612c759c27ac2cffc659a6c69ac3840 GIT binary patch literal 75702 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 literal 0 HcmV?d00001 diff --git a/wfview.pro b/wfview.pro index 0e776f3..bba56b4 100644 --- a/wfview.pro +++ b/wfview.pro @@ -36,20 +36,19 @@ DEFINES += RANDOM_PREFIX=wf macx:INCLUDEPATH += /usr/local/include /opt/local/include macx:LIBS += -L/usr/local/lib -L/opt/local/lib -macx:ICON = ../wfview/wfview.icns - +macx:ICON = ../wfview/resources/wfview.icns +win32:RC_ICONS = ../wfview/resources/wfview.ico QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 QMAKE_TARGET_BUNDLE_PREFIX = org.wfview MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS -MY_ENTITLEMENTS.value = ../wfview/wfview.entitlements +MY_ENTITLEMENTS.value = ../wfview/resources/wfview.entitlements QMAKE_MAC_XCODE_SETTINGS += MY_ENTITLEMENTS -QMAKE_INFO_PLIST = ../wfview/Info.plist +QMAKE_INFO_PLIST = ../wfview/resources/Info.plist !win32:DEFINES += HOST=\\\"`hostname`\\\" UNAME=\\\"`whoami`\\\" !win32:DEFINES += GITSHORT="\\\"$(shell git -C $$PWD rev-parse --short HEAD)\\\"" -win32:INCLUDEPATH += c:/qcustomplot win32:DEFINES += HOST=1 win32:DEFINES += UNAME=1 win32:DEFINES += GITSHORT=1 @@ -75,17 +74,16 @@ linux:QMAKE_POST_LINK += echo; echo; echo "Run install.sh as root from the build # CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT CONFIG(debug, release|debug) { - win32:QCPLIB = qcustomplotd1 - else: QCPLIB = qcustomplotd + linux: QCPLIB = qcustomplotd } else { - win32:QCPLIB = qcustomplot1 - else: QCPLIB = qcustomplot + linux: QCPLIB = qcustomplot } -!macx:LIBS += -L./ -l$$QCPLIB +linux:LIBS += -L./ -l$$QCPLIB -macx:SOURCES += ../qcustomplot/qcustomplot.cpp -macx:HEADERS += ../qcustomplot/qcustomplot.h +!linux:SOURCES += ../qcustomplot/qcustomplot.cpp +!linux:HEADERS += ../qcustomplot/qcustomplot.h +!linux:INCLUDEPATH += ../qcustomplot SOURCES += main.cpp\ wfmain.cpp \ diff --git a/wfview.vcxproj b/wfview.vcxproj index 3c50c5b..cf9ac9c 100644 --- a/wfview.vcxproj +++ b/wfview.vcxproj @@ -1,41 +1,23 @@  - - Debug - Win32 - Release Win32 - - Release - x64 - - + Debug - x64 + Win32 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2} wfview - QtVS_v303 - 10.0.18362.0 - 10.0.18362.0 - $(MSBuildProjectDirectory)\QtMsBuild - + QtVS_v304 + 10.0.19041.0 + 10.0.19041.0 + $(MSBuildProjectDirectory)\QtMsBuild - - v142 - release\ - false - NotSet - Application - release\ - wfview - v142 release\ @@ -45,15 +27,6 @@ release\ wfview - - v142 - debug\ - false - NotSet - Application - debug\ - wfview - v142 debug\ @@ -63,139 +36,20 @@ debug\ wfview - - - - + - - - - - - - - - - - - debug\ - debug\ - wfview - true - $(IncludePath) - $(LibraryPath) - - - wfview - true - $(IncludePath) - $(LibraryPath) - - - release\ - release\ - wfview - true - false - - - wfview - true - false - - - msvc2019_64_5 - core;network;gui;multimedia;widgets;serialport;printsupport - - - msvc2019 - core;network;gui;multimedia;widgets;serialport;printsupport - - - msvc2019_64_5 - core;opengl;network;gui;multimedia;widgets;serialport;printsupport - - - msvc2019 - core;opengl;network;gui;multimedia;widgets;serialport;printsupport - - - - - - - GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;c:\qcustomplot;release;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) - release\ - false - None - 4577;4467;%(DisableSpecificWarnings) - Sync - release\ - MaxSpeed - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;NDEBUG;QT_NO_DEBUG;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;%(PreprocessorDefinitions) - false - - - MultiThreadedDLL - true - true - Level3 - true - - - OpenGL32.lib;shell32.lib;%(AdditionalDependencies) - C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) - -O2 -s "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) - true - false - true - false - true - $(OutDir)\wfview.exe - true - Windows - true - - - Unsigned - None - 0 - - - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_OPENGL_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 - - + debug\debug\wfviewtruerelease\release\wfviewtruefalsemsvc2019core;network;gui;multimedia;widgets;serialport;printsupportmsvc2019core;network;gui;multimedia;widgets;serialport;printsupport + - GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;c:\qcustomplot;release;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + .;..\qcustomplot;release;/include;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) release\ false None @@ -203,20 +57,18 @@ Sync release\ MaxSpeed - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;NDEBUG;QT_NO_DEBUG;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;HOST=1;UNAME=1;GITSHORT=1;NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) false - - + MultiThreadedDLL true true Level3 - true - + true - OpenGL32.lib;shell32.lib;%(AdditionalDependencies) - C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) - -O2 -s "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + shell32.lib;%(AdditionalDependencies) + C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) + -O2 -s "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true false true @@ -233,91 +85,13 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_OPENGL_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;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;HOST=1;UNAME=1;GITSHORT=1;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 - - - - - GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;c:\qcustomplot;debug;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) - debug\ - false - ProgramDatabase - 4577;4467;%(DisableSpecificWarnings) - Sync - debug\ - Disabled - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;%(PreprocessorDefinitions) - false - MultiThreadedDebugDLL - true - true - Level3 - true - - - OpenGL32.lib;shell32.lib;%(AdditionalDependencies) - C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) - "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) - true - true - true - $(OutDir)\wfview.exe - true - Windows - true - - - Unsigned - None - 0 - - - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;QT_MULTIMEDIA_LIB;QT_OPENGL_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 - - + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h - GeneratedFiles\$(ConfigurationName);GeneratedFiles;.;c:\qcustomplot;debug;/include;%(AdditionalIncludeDirectories) - -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) + .;..\qcustomplot;debug;/include;%(AdditionalIncludeDirectories) + -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions) debug\ false ProgramDatabase @@ -325,17 +99,16 @@ Sync debug\ Disabled - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;HOST=1;UNAME=1;GITSHORT=1;%(PreprocessorDefinitions) false MultiThreadedDebugDLL true true Level3 - true - + true - OpenGL32.lib;shell32.lib;%(AdditionalDependencies) - C:\openssl\lib;C:\Utils\my_sql\mysql-5.7.25-winx64\lib;C:\Utils\postgresql\pgsql\lib;%(AdditionalLibraryDirectories) + shell32.lib;%(AdditionalDependencies) + C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true true @@ -351,44 +124,25 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_OPENGL;HOST=1;UNAME=1;GITSHORT=1;QT_MULTIMEDIA_LIB;QT_OPENGL_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;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;HOST=1;UNAME=1;GITSHORT=1;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 - - + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h + - - - + + + - @@ -396,66 +150,277 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document - true true - $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) $(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 -Zi -MDd -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >debug\moc_predefs.h - cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -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 + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -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) debug\moc_predefs.h;%(Outputs) Document - $(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs) $(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 -s -fvisibility=hidden -fvisibility-inlines-hidden -O2 -MD -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E $(QTDIR)\mkspecs\features\data\dummy.cpp 2>NUL >release\moc_predefs.h - cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -fvisibility=hidden -fvisibility-inlines-hidden -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 + cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -s -fvisibility=hidden -fvisibility-inlines-hidden -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) release\moc_predefs.h;%(Outputs) - true true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -489,20 +454,30 @@ - resources - resources - resources - resources - + + + + + + + + + + resourcesresources - style - style - style - style - + + + + + + + + + + stylestyle @@ -518,9 +493,9 @@ - - - - + + + + \ No newline at end of file diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters index efa5219..f8b4c49 100644 --- a/wfview.vcxproj.filters +++ b/wfview.vcxproj.filters @@ -57,6 +57,12 @@ + + Source Files + + + Source Files + Source Files @@ -69,56 +75,59 @@ Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files - - Source Files - Source Files - + + Source Files + + Source Files Source Files + + Source Files + + + Source Files + Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + Header Files + + + Header Files + Header Files @@ -128,65 +137,110 @@ 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Form Files - + Form Files @@ -195,7 +249,7 @@ Form Files - + Form Files @@ -329,27 +383,6 @@ Resource Files - - - - - - - - - - - - - - - - - - - - - @@ -363,11 +396,6 @@ - - Header Files - - - Header Files - + \ No newline at end of file diff --git a/wfview_resource.rc b/wfview_resource.rc new file mode 100644 index 0000000..6ccdf69 --- /dev/null +++ b/wfview_resource.rc @@ -0,0 +1,37 @@ +#include + +IDI_ICON1 ICON DISCARDABLE "C:\\Users\\Phil\\source\\repos\\wfview\\resources\\wfview.ico" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,0,0 + PRODUCTVERSION 0,0,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "\0" + VALUE "FileVersion", "0.0.0.0\0" + VALUE "LegalCopyright", "\0" + VALUE "OriginalFilename", "wfview.exe\0" + VALUE "ProductName", "wfview\0" + VALUE "ProductVersion", "0.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1200 + END + END +/* End of Version info */ +