Merge branch 'master' of https://github.com/ambray/entomoidUI

ambray · Nov 28, 2015 · b049ca4 · b049ca4
2 parents 3ac91b0 + 3635393
commit b049ca4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/EntomoidUI/src/CMakeLists.txt b/EntomoidUI/src/CMakeLists.txt
@@ -4,7 +4,7 @@ file(GLOB entomoid_SOURCES *.cpp)
 file(GLOB entomoid_HEADERS *.hpp)
 if(WIN32)
     file(GLOB platform_SOURCES win/*.cpp)
-    file(GLOB pltform_HEADERS win/*.hpp)
+    file(GLOB platform_HEADERS win/*.hpp)
 endif(WIN32)
 if(UNIX)
     file(GLOB platform_SOURCES nix/*.cpp)

diff --git a/EntomoidUI/src/win/WinUi.hpp b/EntomoidUI/src/win/WinUi.hpp
@@ -30,6 +30,7 @@
 #include <Windows.h>
 #include "../interface.hpp"
 #include "../Settings.hpp"
+#include "../Utils.hpp"
 #include "WinUtils.hpp"
 
 

diff --git a/EntomoidUI/src/win/WinUtils.hpp b/EntomoidUI/src/win/WinUtils.hpp
@@ -31,6 +31,7 @@
 #include <stdint.h>
 #include <string>
 #include <memory>
+#include "../Settings.hpp"
 
 #define WRAP_WINDOWS_RUNTIME_ERROR(msg)\
 	do {\