Fixed include order problems #55

diff --git a/WinMute.slnx b/WinMute.slnx
index 00cc5b4efbd836e9f0f962d3f8120fa173abb293..8e6c99e6a897dc21d9806b1d87bc276e3f254311 100644 (file)
--- a/WinMute.slnx
+++ b/WinMute.slnx
@@ -2,7 +2,5 @@
   <Configurations>
     <Platform Name="x64" />
   </Configurations>
-  <Project Path="WinMute/WinMute.vcxproj" Id="479d2958-3ffc-43f8-8217-44d0ff9c11b1">
-    <BuildType Project="Release" />
-  </Project>
+  <Project Path="WinMute/WinMute.vcxproj" Id="479d2958-3ffc-43f8-8217-44d0ff9c11b1" />
 </Solution>

diff --git a/WinMute/MuteControl.cpp b/WinMute/MuteControl.cpp
index 7b962aa2b8849bd4d37e91c32a3d481f88066f47..afcf76361a1f7adbff785c12d3a8b6a574066202 100644 (file)
--- a/WinMute/MuteControl.cpp
+++ b/WinMute/MuteControl.cpp
@@ -440,7 +440,7 @@ void MuteControl::NotifyLogout()
     }
 }
 
-void MuteControl::NotifySuspend(bool [[maybe_unused]] active)
+void MuteControl::NotifySuspend([[maybe_unused]] bool active)
 {
     WMLog::GetInstance().LogInfo(L"Mute Event: Suspend start");
     if (muteConfig_[MuteTypeSuspend].shouldMute) {

diff --git a/WinMute/MuteControl.h b/WinMute/MuteControl.h
index 05b7adb031697da21580da196fcfb04249de6179..2a0f53699174820f8394305d38b808927fec92a6 100644 (file)
--- a/WinMute/MuteControl.h
+++ b/WinMute/MuteControl.h
@@ -35,6 +35,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "common.h"
 
+#include "WinAudio.h"
+#include "TrayIcon.h"
+
 class MuteControl {
    public:
     MuteControl();

diff --git a/WinMute/QuietHoursTimer.h b/WinMute/QuietHoursTimer.h
index 71400677d3dce74d4e3fd3a3b85648de24bcad4e..6a9a4542d43968222dcdc25c03ce700a7f0ee1c4 100644 (file)
--- a/WinMute/QuietHoursTimer.h
+++ b/WinMute/QuietHoursTimer.h
@@ -35,6 +35,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "common.h"
 
+#include "WMSettings.h"
+
 static constexpr int WM_WINMUTE_QUIETHOURS_START = WM_APP + 202;
 static constexpr int WM_WINMUTE_QUIETHOURS_END = WM_APP + 203;
 

diff --git a/WinMute/UpdateChecker.h b/WinMute/UpdateChecker.h
index a35017932a0554baf94d50f662aa944bfac704a6..d85b9f95dd24c64ff63c0c0375027e7427724fdf 100644 (file)
--- a/WinMute/UpdateChecker.h
+++ b/WinMute/UpdateChecker.h
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "WMSettings.h"
 
-#include <nlohmann/json.hpp>
+#include "libs/json.hpp"
 
 enum class UpdateCheckInterval : int {
    DISABLED = 0,

diff --git a/WinMute/WinMute.vcxproj b/WinMute/WinMute.vcxproj
index db1a043a58a78c4f4d7f2ec11a94e6cd3a4f8c93..42ed7b55109086cd3a1c3b66bf1fe2f74fed6b17 100644 (file)
--- a/WinMute/WinMute.vcxproj
+++ b/WinMute/WinMute.vcxproj
@@ -77,7 +77,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>mincore.lib;windowsapp.lib;Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;PowrProf.lib%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mincore.lib;windowsapp.lib;Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;PowrProf.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
@@ -107,7 +107,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>mincore.lib;windowsapp.lib;Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;PowrProf.lib%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mincore.lib;windowsapp.lib;Winhttp.lib;Bthprops.lib;Winmm.lib;UxTheme.lib;Wlanapi.lib;comctl32.lib;WtsApi32.lib;Version.lib;PowrProf.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
       <CETCompat>true</CETCompat>