being explicit is good

Author: Bret Curtis

CMakeLists.txt

@@ -136,13 +136,13 @@ set_property(TARGET opendf APPEND PROPERTY INCLUDE_DIRECTORIES
     ${OPENSCENEGRAPH_INCLUDE_DIRS}
     ${SDL2_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
-    ${MYGUI_INCLUDE_DIRS}
+    ${MyGUI_INCLUDE_DIRS}
 )
 target_link_libraries(opendf
     ${OPENSCENEGRAPH_LIBRARIES}
     ${SDL2_LIBRARY}
     ${OPENGL_gl_LIBRARY}
-    ${MYGUI_LIBRARIES}
+    ${MyGUI_LIBRARIES}
 )
 
 

src/components/mygui_osg/datamanager.h

@@ -1,7 +1,7 @@
 #ifndef COMPONENTS_MYGUI_OSG_DATAMANAGER_H
 #define COMPONENTS_MYGUI_OSG_DATAMANAGER_H
 
-#include <MyGUI_DataManager.h>
+#include <MYGUI/MyGUI_DataManager.h>
 
 
 namespace MyGUI_OSG

src/components/mygui_osg/diagnostic.h

@@ -7,7 +7,7 @@
 #ifndef COMPONENTS_MYGUI_OSG_DIAGNOSTIC_H
 #define COMPONENTS_MYGUI_OSG_DIAGNOSTIC_H
 
-#include "MyGUI_Prerequest.h"
+#include "MYGUI/MyGUI_Prerequest.h"
 
 #define MYGUI_PLATFORM_LOG_SECTION "Platform"
 #define MYGUI_PLATFORM_LOG_FILENAME "MyGUI.log"

src/components/mygui_osg/rendermanager.cpp

@@ -1,11 +1,11 @@
 
 #include "rendermanager.h"
 
-#include <MyGUI_VertexData.h>
-#include <MyGUI_Gui.h>
-#include <MyGUI_Timer.h>
-#include <MyGUI_ITexture.h>
-#include <MyGUI_RenderManager.h>
+#include <MYGUI/MyGUI_VertexData.h>
+#include <MYGUI/MyGUI_Gui.h>
+#include <MYGUI/MyGUI_Timer.h>
+#include <MYGUI/MyGUI_ITexture.h>
+#include <MYGUI/MyGUI_RenderManager.h>
 
 #include <osgViewer/Viewer>
 #include <osgDB/ReadFile>

src/components/mygui_osg/rendermanager.h

@@ -1,7 +1,7 @@
 #ifndef COMPONENTS_MYGUI_OSG_RENDERMANAGER_H
 #define COMPONENTS_MYGUI_OSG_RENDERMANAGER_H
 
-#include <MyGUI_RenderManager.h>
+#include <MYGUI/MyGUI_RenderManager.h>
 
 #include <osg/ref_ptr>
 

src/components/mygui_osg/texture.cpp

@@ -5,7 +5,7 @@
 
 #include <osg/Texture2D>
 #include <osgDB/ReadFile>
-#include <MyGUI_Gui.h>
+#include <MYGUI/MyGUI_Gui.h>
 
 #include "diagnostic.h"
 #include "rendermanager.h"

src/components/mygui_osg/texture.h

@@ -1,7 +1,7 @@
 #ifndef COMPONENTS_MYGUI_OSG_TEXTURE_H
 #define COMPONENTS_MYGUI_OSG_TEXTURE_H
 
-#include <MyGUI_ITexture.h>
+#include <MYGUI/MyGUI_ITexture.h>
 
 #include <osg/ref_ptr>
 

src/components/mygui_osg/vertexbuffer.cpp

@@ -1,8 +1,8 @@
 
 #include "vertexbuffer.h"
 
-#include <MyGUI_Diagnostic.h>
-#include <MyGUI_VertexData.h>
+#include <MYGUI/MyGUI_Diagnostic.h>
+#include <MYGUI/MyGUI_VertexData.h>
 
 #include <osg/BufferObject>
 #include <osg/Array>

src/components/mygui_osg/vertexbuffer.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <MyGUI_IVertexBuffer.h>
+#include <MYGUI/MyGUI_IVertexBuffer.h>
 
 #include <osg/ref_ptr>
 #include <osg/BufferObject>

src/opendf/gui/gui.cpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <map>
 
-#include <MyGUI.h>
+#include <MYGUI/MyGUI.h>
 
 #include <SDL_scancode.h>
 #include <SDL_mouse.h>