Merge pull request #38 from jpcima/includes

arrange header inclusions for MinGW, making them lower case
steinbergmedia · Nov 8, 2017 · af2f951 · af2f951
2 parents 072bb07 + 4b06877
commit af2f951
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/vstgui/lib/platform/win32/win32dragcontainer.h b/vstgui/lib/platform/win32/win32dragcontainer.h
@@ -10,6 +10,7 @@
 #if WINDOWS
 
 #include <windows.h>
+#include <objidl.h>
 #include <vector>
 #include <string>
 
@@ -44,4 +45,4 @@ class WinDragContainer : public IDataPackage
 
 #endif // WINDOWS
 
-#endif // __win32dragcontainer__
+#endif // __win32dragcontainer__
diff --git a/vstgui/lib/platform/win32/win32support.h b/vstgui/lib/platform/win32/win32support.h
@@ -17,7 +17,7 @@ using std::min;
 using std::max;
 #include <windows.h>
 #if defined (WINAPI_FAMILY_SYSTEM)
-#include <VersionHelpers.h>
+#include <versionhelpers.h>
 #endif
 
 #include <objidl.h>

diff --git a/vstgui/plugin-bindings/plugguieditor.cpp b/vstgui/plugin-bindings/plugguieditor.cpp
@@ -11,7 +11,7 @@
 #define kIdleRateMin   4 // minimum time between 2 idles in ms
 
 #if WINDOWS
-#include <Windows.h>
+#include <windows.h>
 #endif
 
 #if MAC

diff --git a/vstgui/standalone/source/platform/win32/win32application.cpp b/vstgui/standalone/source/platform/win32/win32application.cpp
@@ -14,8 +14,8 @@
 #include "win32preference.h"
 #include "win32window.h"
 #include "win32commondirectories.h"
-#include <ShellScalingAPI.h>
-#include <Windows.h>
+#include <shellscalingapi.h>
+#include <windows.h>
 #include <array>
 #include <chrono>
 

diff --git a/vstgui/standalone/source/platform/win32/win32commondirectories.cpp b/vstgui/standalone/source/platform/win32/win32commondirectories.cpp
@@ -6,7 +6,7 @@
 #include "../../../../lib/platform/win32/win32support.h"
 #include "../../../include/iappdelegate.h"
 #include "../../../include/iapplication.h"
-#include <Shlobj.h>
+#include <shlobj.h>
 #include <array>
 
 //------------------------------------------------------------------------

diff --git a/vstgui/standalone/source/platform/win32/win32menu.h b/vstgui/standalone/source/platform/win32/win32menu.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "../../../../lib/cstring.h"
-#include <Windows.h>
+#include <windows.h>
 #include <functional>
 #include <vector>
 #include <memory>
@@ -75,4 +75,4 @@ struct Win32Menu : Win32MenuItem
 //------------------------------------------------------------------------
 } // Platform
 } // Standalone
-} // VSTGUI
+} // VSTGUI
diff --git a/vstgui/standalone/source/platform/win32/win32window.cpp b/vstgui/standalone/source/platform/win32/win32window.cpp
@@ -12,10 +12,10 @@
 #include "../../../include/iapplication.h"
 #include "../../application.h"
 #include "../iplatformwindow.h"
-#include <Dwmapi.h>
-#include <ShellScalingAPI.h>
-#include <VersionHelpers.h>
-#include <Windows.h>
+#include <dwmapi.h>
+#include <shellscalingapi.h>
+#include <versionhelpers.h>
+#include <windows.h>
 #include <d2d1.h>
 #include <windowsx.h>
 

diff --git a/vstgui/tests/unittest/lib/platform_helper_win32.cpp b/vstgui/tests/unittest/lib/platform_helper_win32.cpp
@@ -4,7 +4,7 @@
 
 #include "platform_helper.h"
 #include "../../../lib/platform/win32/win32support.h"
-#include <Windows.h>
+#include <windows.h>
 
 namespace VSTGUI {
 namespace UnitTest {

diff --git a/vstgui/tests/unittest/unittests.cpp b/vstgui/tests/unittest/unittests.cpp
@@ -15,7 +15,8 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
-#include <Windows.h>
+#include <windows.h>
+#include <objbase.h>
 #endif
 
 namespace VSTGUI {