diff --git a/CMakeLists.txt b/CMakeLists.txt
index a12126c2a..338a5e7e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,6 @@ include_directories(${UUID_INCLUDE_DIR})
endif (WIN32)
if (MSVC10)
set(PLATFORM_INCLUDE_DIR "")
- add_definitions(-DMYGUI_DONT_REPLACE_NULLPTR)
endif()
if (APPLE)
@@ -187,6 +186,7 @@ endif (APPLE)
# Dependencies
find_package(OGRE REQUIRED)
+find_package(MyGUI REQUIRED)
find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
find_package(OIS REQUIRED)
find_package(OpenAL REQUIRED)
@@ -203,14 +203,14 @@ include_directories("."
${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE ${OGRE_PLUGIN_INCLUDE_DIRS}
${OIS_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}
${PLATFORM_INCLUDE_DIR}
- ${CMAKE_HOME_DIRECTORY}/extern/mygui_3.0.1/MyGUIEngine/include
- ${CMAKE_HOME_DIRECTORY}/extern/mygui_3.0.1/OgrePlatform/include
+ ${MYGUI_INCLUDE_DIRS}
+ ${MYGUI_PLATFORM_INCLUDE_DIRS}
${OPENAL_INCLUDE_DIR}
${UUID_INCLUDE_DIR}
${LIBDIR}
)
-link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR})
+link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR} ${MYGUI_LIB_DIR})
if(APPLE)
# List used Ogre plugins
@@ -222,13 +222,6 @@ endif(APPLE)
add_subdirectory( extern/mygui_3.0.1 )
-# Make sure that certain libraries are used as static libraries
-# This is in effect turns off __declspec (dllexport) for windows
-# Each library will also need to be configured to build as a static lib
-
-# MyGUI: extern/mygui_3.0.0/
-add_definitions(-DMYGUI_STATIC)
-
# Specify build paths
if (APPLE)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 6d33298df..d6101c919 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -87,9 +87,9 @@ target_link_libraries(openmw
${OPENAL_LIBRARY}
${SOUND_INPUT_LIBRARY}
${BULLET_LIBRARIES}
+ ${MYGUI_LIBRARIES}
+ MyGUI.OgrePlatform #TODO MyGUI ogre platform is not added by the find script
components
- MyGUIEngine
- MyGUIOgrePlatform
)
if(APPLE)
diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake
new file mode 100644
index 000000000..339f494dd
--- /dev/null
+++ b/cmake/FindMyGUI.cmake
@@ -0,0 +1,125 @@
+# - Find MyGUI includes and library
+#
+# This module defines
+# MYGUI_INCLUDE_DIRS
+# MYGUI_LIBRARIES, the libraries to link against to use MYGUI.
+# MYGUI_LIB_DIR, the location of the libraries
+# MYGUI_FOUND, If false, do not try to use MYGUI
+#
+# Copyright © 2007, Matt Williams
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+CMAKE_POLICY(PUSH)
+include(FindPkgMacros)
+
+# IF (MYGUI_LIBRARIES AND MYGUI_INCLUDE_DIRS)
+ # SET(MYGUI_FIND_QUIETLY TRUE)
+# ENDIF (MYGUI_LIBRARIES AND MYGUI_INCLUDE_DIRS)
+
+IF (WIN32) #Windows
+ MESSAGE(STATUS "Looking for MyGUI")
+ SET(MYGUISDK $ENV{MYGUI_HOME})
+ IF (MYGUISDK)
+ findpkg_begin ( "MYGUI" )
+ MESSAGE(STATUS "Using MyGUI in OGRE SDK")
+ STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" )
+
+ find_path ( MYGUI_INCLUDE_DIRS
+ MyGUI.h
+ "${MYGUISDK}/MyGUIEngine/include"
+ NO_DEFAULT_PATH )
+
+ find_path ( MYGUI_PLATFORM_INCLUDE_DIRS
+ MyGUI_OgrePlatform.h
+ "${MYGUISDK}/Platforms/Ogre/OgrePlatform/include"
+ NO_DEFAULT_PATH )
+
+ SET ( MYGUI_LIB_DIR ${MYGUISDK}/*/lib )
+
+ find_library ( MYGUI_LIBRARIES_REL NAMES
+ MyGUIEngine.lib
+ MyGUI.OgrePlatform.lib
+ HINTS
+ ${MYGUI_LIB_DIR}
+ PATH_SUFFIXES "" release relwithdebinfo minsizerel )
+
+ find_library ( MYGUI_LIBRARIES_DBG NAMES
+ MyGUIEngine_d.lib
+ MyGUI.OgrePlatform_d.lib
+ HINTS
+ ${MYGUI_LIB_DIR}
+ PATH_SUFFIXES "" debug )
+
+ find_library ( MYGUI_PLATFORM_LIBRARIES_REL NAMES
+ MyGUI.OgrePlatform.lib
+ HINTS
+ ${MYGUI_LIB_DIR}
+ PATH_SUFFIXES "" release relwithdebinfo minsizerel )
+
+ find_library ( MYGUI_PLATFORM_LIBRARIES_DBG NAMES
+ MyGUI.OgrePlatform_d.lib
+ HINTS
+ ${MYGUI_LIB_DIR}
+ PATH_SUFFIXES "" debug )
+
+ make_library_set ( MYGUI_LIBRARIES )
+ make_library_set ( MYGUI_PLATFORM_LIBRARIES )
+
+ MESSAGE ("${MYGUI_LIBRARIES}")
+ MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}")
+
+ findpkg_finish ( "MYGUI" )
+
+ ENDIF (MYGUISDK)
+ IF (OGRESOURCE)
+ MESSAGE(STATUS "Using MyGUI in OGRE dependencies")
+ STRING(REGEX REPLACE "[\\]" "/" OGRESDK "${OGRESOURCE}" )
+ SET(MYGUI_INCLUDE_DIRS ${OGRESOURCE}/OgreMain/include/MYGUI)
+ SET(MYGUI_LIB_DIR ${OGRESOURCE}/lib)
+ SET(MYGUI_LIBRARIES debug Debug/MyGUIEngine_d optimized Release/MyGUIEngine)
+ ENDIF (OGRESOURCE)
+ELSE (WIN32) #Unix
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
+ FIND_PACKAGE(PkgConfig)
+ PKG_SEARCH_MODULE(MYGUI MYGUI MyGUI)
+ IF (MYGUI_INCLUDE_DIRS)
+ SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS})
+ SET(MYGUI_LIB_DIR ${MYGUI_LIBDIR})
+ SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
+ ELSE (MYGUI_INCLUDE_DIRS)
+ FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
+ FIND_LIBRARY(MYGUI_LIBRARIES mygui PATHS /usr/lib /usr/local/lib)
+ SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
+ STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
+ STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
+ ENDIF (MYGUI_INCLUDE_DIRS)
+ENDIF (WIN32)
+
+#Do some preparation
+SEPARATE_ARGUMENTS(MYGUI_INCLUDE_DIRS)
+SEPARATE_ARGUMENTS(MYGUI_LIBRARIES)
+SEPARATE_ARGUMENTS(MYGUI_PLATFORM_LIBRARIES)
+
+SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS} CACHE PATH "")
+SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
+SET(MYGUI_LIBRARIES ${MYGUI_PLATFORM_LIBRARIES} CACHE STRING "")
+SET(MYGUI_LIB_DIR ${MYGUI_LIB_DIR} CACHE PATH "")
+
+IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES)
+ SET(MYGUI_FOUND TRUE)
+ENDIF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES)
+
+IF (MYGUI_FOUND)
+ MARK_AS_ADVANCED(MYGUI_LIB_DIR)
+ IF (NOT MYGUI_FIND_QUIETLY)
+ MESSAGE(STATUS " libraries : ${MYGUI_LIBRARIES} from ${MYGUI_LIB_DIR}")
+ MESSAGE(STATUS " includes : ${MYGUI_INCLUDE_DIRS}")
+ ENDIF (NOT MYGUI_FIND_QUIETLY)
+ELSE (MYGUI_FOUND)
+ IF (MYGUI_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find MYGUI")
+ ENDIF (MYGUI_FIND_REQUIRED)
+ENDIF (MYGUI_FOUND)
+
+CMAKE_POLICY(POP)
\ No newline at end of file
diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/extern/mygui_3.0.1/CMakeLists.txt
index 2cbe8aabe..38f8abbba 100644
--- a/extern/mygui_3.0.1/CMakeLists.txt
+++ b/extern/mygui_3.0.1/CMakeLists.txt
@@ -1,25 +1,5 @@
# Minimal MyGUI build system for OpenMW
-cmake_minimum_required(VERSION 2.6)
-project(MYGUI)
-
-# Use Freetype
-find_package(Freetype REQUIRED)
-set(MYGUI_USE_FREETYPE TRUE)
-
-# Use Ogre
-add_definitions("-DMYGUI_OGRE_PLATFORM")
-
-# Static linking
-set(MYGUI_LIB_TYPE STATIC)
-add_definitions(-DMYGUI_STATIC)
-
-# Setup MyGUIEngine project
-add_subdirectory(MyGUIEngine)
-
-# Setup OgrePlatform
-add_subdirectory(OgrePlatform)
-
# Copy resource files into the build directory
set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}/openmw_resources)
set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
diff --git a/extern/mygui_3.0.1/MyGUIEngine/CMakeLists.txt b/extern/mygui_3.0.1/MyGUIEngine/CMakeLists.txt
deleted file mode 100644
index 27362e027..000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-set (PROJECT_NAME MyGUIEngine)
-
-project( ${PROJECT_NAME} )
-
-include(${PROJECT_NAME}.list)
-
-include_directories(include)
-if (MYGUI_USE_FREETYPE)
- include_directories(
- ${FREETYPE_INCLUDE_DIRS}
- )
- add_definitions(-DMYGUI_USE_FREETYPE)
-endif ()
-
-add_definitions(-DMYGUI_BUILD)
-
-if (WIN32)
- add_definitions(-DNOMINMAX)
-endif ()
-
-add_library(${PROJECT_NAME} ${MYGUI_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
-if (MYGUI_USE_FREETYPE)
- target_link_libraries(${PROJECT_NAME}
- ${FREETYPE_LIBRARIES}
- )
-endif()
-
-# We don't need this lib in OS X. uuid functions is in libc here.
-if (NOT APPLE)
- target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS} uuid)
-endif(NOT APPLE)
-
-if (MINGW)
- target_link_libraries(${PROJECT_NAME} libwinmm.a)
-endif (MINGW)
diff --git a/extern/mygui_3.0.1/MyGUIEngine/MyGUIEngine.list b/extern/mygui_3.0.1/MyGUIEngine/MyGUIEngine.list
deleted file mode 100644
index 42fa44718..000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/MyGUIEngine.list
+++ /dev/null
@@ -1,561 +0,0 @@
-set (HEADER_FILES
- include/MyGUI_Allocator.h
- include/MyGUI_CustomAllocator.h
- include/MyGUI_DDItemInfo.h
- include/MyGUI_IBItemInfo.h
- include/MyGUI_MenuItemType.h
- include/MyGUI_MessageStyle.h
- include/MyGUI_WidgetToolTip.h
- include/MyGUI_Button.h
- include/MyGUI_Canvas.h
- include/MyGUI_ComboBox.h
- include/MyGUI_DDContainer.h
- include/MyGUI_Edit.h
- include/MyGUI_HScroll.h
- include/MyGUI_ItemBox.h
- include/MyGUI_List.h
- include/MyGUI_ListBox.h
- include/MyGUI_ListCtrl.h
- include/MyGUI_MenuBar.h
- include/MyGUI_MenuCtrl.h
- include/MyGUI_MenuItem.h
- include/MyGUI_Message.h
- include/MyGUI_MultiList.h
- include/MyGUI_PopupMenu.h
- include/MyGUI_Progress.h
- include/MyGUI_ScrollView.h
- include/MyGUI_StaticImage.h
- include/MyGUI_StaticText.h
- include/MyGUI_Tab.h
- include/MyGUI_TabItem.h
- include/MyGUI_VScroll.h
- include/MyGUI_Widget.h
- include/MyGUI_Window.h
- include/MyGUI_IWidgetFactory.h
- include/MyGUI_Bitwise.h
- include/MyGUI_CoordConverter.h
- include/MyGUI_DataFileStream.h
- include/MyGUI_DataStream.h
- include/MyGUI_Delegate.h
- include/MyGUI_DelegateImplement.h
- include/MyGUI_DynLib.h
- include/MyGUI_Enumerator.h
- include/MyGUI_EventPair.h
- include/MyGUI_Guid.h
- include/MyGUI_RenderOut.h
- include/MyGUI_TextChangeHistory.h
- include/MyGUI_TextIterator.h
- include/MyGUI_TextureUtility.h
- include/MyGUI_TextView.h
- include/MyGUI_Timer.h
- include/MyGUI_UString.h
- include/MyGUI_Utility.h
- include/MyGUI_WidgetTranslate.h
- include/MyGUI_XmlDocument.h
- include/MyGUI_LogManager.h
- include/MyGUI_LogStream.h
- include/MyGUI.h
- include/MyGUI_CastWidget.h
- include/MyGUI_Common.h
- include/MyGUI_Diagnostic.h
- include/MyGUI_Exception.h
- include/MyGUI_GenericFactory.h
- include/MyGUI_Macros.h
- include/MyGUI_Platform.h
- include/MyGUI_Precompiled.h
- include/MyGUI_Prerequest.h
- include/MyGUI_RenderFormat.h
- include/MyGUI_ResourceHolder.h
- include/MyGUI_WidgetDefines.h
- include/MyGUI_ICroppedRectangle.h
- include/MyGUI_IDataStream.h
- include/MyGUI_Instance.h
- include/MyGUI_IObject.h
- include/MyGUI_ISerializable.h
- include/MyGUI_ITexture.h
- include/MyGUI_IUnlinkWidget.h
- include/MyGUI_IVertexBuffer.h
- include/MyGUI_IWidgetCreator.h
- include/MyGUI_Plugin.h
- include/MyGUI_RTTI.h
- include/MyGUI_BiIndexBase.h
- include/MyGUI_ScrollViewBase.h
- include/MyGUI_WidgetEvent.h
- include/MyGUI_WidgetUserData.h
- include/MyGUI_EditText.h
- include/MyGUI_MainSkin.h
- include/MyGUI_RawRect.h
- include/MyGUI_RotatingSkin.h
- include/MyGUI_SimpleText.h
- include/MyGUI_SubSkin.h
- include/MyGUI_TileRect.h
- include/MyGUI_IStateInfo.h
- include/MyGUI_ISubWidget.h
- include/MyGUI_ISubWidgetRect.h
- include/MyGUI_ISubWidgetText.h
- include/MyGUI_LayerItem.h
- include/MyGUI_LayerNode.h
- include/MyGUI_OverlappedLayer.h
- include/MyGUI_RenderItem.h
- include/MyGUI_SharedLayer.h
- include/MyGUI_SharedLayerNode.h
- include/MyGUI_ILayer.h
- include/MyGUI_ILayerItem.h
- include/MyGUI_ILayerNode.h
- include/MyGUI_IRenderTarget.h
- include/MyGUI_ActionController.h
- include/MyGUI_ControllerEdgeHide.h
- include/MyGUI_ControllerFadeAlpha.h
- include/MyGUI_ControllerItem.h
- include/MyGUI_ControllerPosition.h
- include/MyGUI_ResourceImageSet.h
- include/MyGUI_ResourceImageSetPointer.h
- include/MyGUI_ResourceManualFont.h
- include/MyGUI_ResourceManualPointer.h
- include/MyGUI_ResourceSkin.h
- include/MyGUI_ResourceTrueTypeFont.h
- include/MyGUI_IFont.h
- include/MyGUI_IPointer.h
- include/MyGUI_IResource.h
- include/MyGUI_ChildSkinInfo.h
- include/MyGUI_FontData.h
- include/MyGUI_MaskPickInfo.h
- include/MyGUI_SubWidgetBinding.h
- include/MyGUI_SubWidgetInfo.h
- include/MyGUI_Align.h
- include/MyGUI_Any.h
- include/MyGUI_Colour.h
- include/MyGUI_CommonStateInfo.h
- include/MyGUI_ImageInfo.h
- include/MyGUI_InputDefine.h
- include/MyGUI_RenderTargetInfo.h
- include/MyGUI_TCoord.h
- include/MyGUI_TPoint.h
- include/MyGUI_TRect.h
- include/MyGUI_TSize.h
- include/MyGUI_Types.h
- include/MyGUI_Version.h
- include/MyGUI_VertexData.h
- include/MyGUI_WidgetStyle.h
- include/MyGUI_ClipboardManager.h
- include/MyGUI_ControllerManager.h
- include/MyGUI_DataManager.h
- include/MyGUI_DynLibManager.h
- include/MyGUI_FactoryManager.h
- include/MyGUI_FontManager.h
- include/MyGUI_Gui.h
- include/MyGUI_InputManager.h
- include/MyGUI_LanguageManager.h
- include/MyGUI_LayerManager.h
- include/MyGUI_LayoutManager.h
- include/MyGUI_PluginManager.h
- include/MyGUI_PointerManager.h
- include/MyGUI_RenderManager.h
- include/MyGUI_ResourceManager.h
- include/MyGUI_SkinManager.h
- include/MyGUI_SubWidgetManager.h
- include/MyGUI_WidgetManager.h
-)
-set (SOURCE_FILES
- src/MyGUI_Button.cpp
- src/MyGUI_Canvas.cpp
- src/MyGUI_ComboBox.cpp
- src/MyGUI_DDContainer.cpp
- src/MyGUI_Edit.cpp
- src/MyGUI_HScroll.cpp
- src/MyGUI_ItemBox.cpp
- src/MyGUI_List.cpp
- src/MyGUI_ListBox.cpp
- src/MyGUI_ListCtrl.cpp
- src/MyGUI_MenuBar.cpp
- src/MyGUI_MenuCtrl.cpp
- src/MyGUI_MenuItem.cpp
- src/MyGUI_Message.cpp
- src/MyGUI_MultiList.cpp
- src/MyGUI_PopupMenu.cpp
- src/MyGUI_Progress.cpp
- src/MyGUI_ScrollView.cpp
- src/MyGUI_StaticImage.cpp
- src/MyGUI_StaticText.cpp
- src/MyGUI_Tab.cpp
- src/MyGUI_TabItem.cpp
- src/MyGUI_VScroll.cpp
- src/MyGUI_Widget.cpp
- src/MyGUI_Window.cpp
- src/MyGUI_EditText.cpp
- src/MyGUI_MainSkin.cpp
- src/MyGUI_RawRect.cpp
- src/MyGUI_RotatingSkin.cpp
- src/MyGUI_SimpleText.cpp
- src/MyGUI_SubSkin.cpp
- src/MyGUI_TileRect.cpp
- src/MyGUI_LayerItem.cpp
- src/MyGUI_LayerNode.cpp
- src/MyGUI_OverlappedLayer.cpp
- src/MyGUI_RenderItem.cpp
- src/MyGUI_SharedLayer.cpp
- src/MyGUI_SharedLayerNode.cpp
- src/MyGUI_ActionController.cpp
- src/MyGUI_ControllerEdgeHide.cpp
- src/MyGUI_ControllerFadeAlpha.cpp
- src/MyGUI_ControllerPosition.cpp
- src/MyGUI_Exception.cpp
- src/MyGUI_Precompiled.cpp
- src/MyGUI_IWidgetCreator.cpp
- src/MyGUI_ScrollViewBase.cpp
- src/MyGUI_ResourceImageSet.cpp
- src/MyGUI_ResourceImageSetPointer.cpp
- src/MyGUI_ResourceManualFont.cpp
- src/MyGUI_ResourceManualPointer.cpp
- src/MyGUI_ResourceSkin.cpp
- src/MyGUI_ResourceTrueTypeFont.cpp
- src/MyGUI_MaskPickInfo.cpp
- src/MyGUI_Any.cpp
- src/MyGUI_Colour.cpp
- src/MyGUI_ClipboardManager.cpp
- src/MyGUI_ControllerManager.cpp
- src/MyGUI_DataManager.cpp
- src/MyGUI_DynLibManager.cpp
- src/MyGUI_FactoryManager.cpp
- src/MyGUI_FontManager.cpp
- src/MyGUI_Gui.cpp
- src/MyGUI_InputManager.cpp
- src/MyGUI_LanguageManager.cpp
- src/MyGUI_LayerManager.cpp
- src/MyGUI_LayoutManager.cpp
- src/MyGUI_PluginManager.cpp
- src/MyGUI_PointerManager.cpp
- src/MyGUI_RenderManager.cpp
- src/MyGUI_ResourceManager.cpp
- src/MyGUI_SkinManager.cpp
- src/MyGUI_SubWidgetManager.cpp
- src/MyGUI_WidgetManager.cpp
- src/MyGUI_DataFileStream.cpp
- src/MyGUI_DataStream.cpp
- src/MyGUI_DynLib.cpp
- src/MyGUI_Guid.cpp
- src/MyGUI_RenderOut.cpp
- src/MyGUI_TextIterator.cpp
- src/MyGUI_TextureUtility.cpp
- src/MyGUI_Timer.cpp
- src/MyGUI_XmlDocument.cpp
- src/MyGUI_LogManager.cpp
- src/MyGUI_LogStream.cpp
-)
-SOURCE_GROUP("Source Files\\Widget\\Widget" FILES
- src/MyGUI_Button.cpp
- src/MyGUI_Canvas.cpp
- src/MyGUI_ComboBox.cpp
- src/MyGUI_DDContainer.cpp
- src/MyGUI_Edit.cpp
- src/MyGUI_HScroll.cpp
- src/MyGUI_ItemBox.cpp
- src/MyGUI_List.cpp
- src/MyGUI_ListBox.cpp
- src/MyGUI_ListCtrl.cpp
- src/MyGUI_MenuBar.cpp
- src/MyGUI_MenuCtrl.cpp
- src/MyGUI_MenuItem.cpp
- src/MyGUI_Message.cpp
- src/MyGUI_MultiList.cpp
- src/MyGUI_PopupMenu.cpp
- src/MyGUI_Progress.cpp
- src/MyGUI_ScrollView.cpp
- src/MyGUI_StaticImage.cpp
- src/MyGUI_StaticText.cpp
- src/MyGUI_Tab.cpp
- src/MyGUI_TabItem.cpp
- src/MyGUI_VScroll.cpp
- src/MyGUI_Widget.cpp
- src/MyGUI_Window.cpp
-)
-SOURCE_GROUP("Source Files\\Widget" FILES
-)
-SOURCE_GROUP("Source Files\\Core\\SubWidget" FILES
- src/MyGUI_EditText.cpp
- src/MyGUI_MainSkin.cpp
- src/MyGUI_RawRect.cpp
- src/MyGUI_RotatingSkin.cpp
- src/MyGUI_SimpleText.cpp
- src/MyGUI_SubSkin.cpp
- src/MyGUI_TileRect.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\LayerItem" FILES
- src/MyGUI_LayerItem.cpp
- src/MyGUI_LayerNode.cpp
- src/MyGUI_OverlappedLayer.cpp
- src/MyGUI_RenderItem.cpp
- src/MyGUI_SharedLayer.cpp
- src/MyGUI_SharedLayerNode.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Controller" FILES
- src/MyGUI_ActionController.cpp
- src/MyGUI_ControllerEdgeHide.cpp
- src/MyGUI_ControllerFadeAlpha.cpp
- src/MyGUI_ControllerPosition.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Common\\Interfaces" FILES
- src/MyGUI_IWidgetCreator.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Common\\Base" FILES
- src/MyGUI_ScrollViewBase.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Common" FILES
- src/MyGUI_Exception.cpp
- src/MyGUI_Precompiled.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Resource\\Data" FILES
- src/MyGUI_MaskPickInfo.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Resource" FILES
- src/MyGUI_ResourceImageSet.cpp
- src/MyGUI_ResourceImageSetPointer.cpp
- src/MyGUI_ResourceManualFont.cpp
- src/MyGUI_ResourceManualPointer.cpp
- src/MyGUI_ResourceSkin.cpp
- src/MyGUI_ResourceTrueTypeFont.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Types" FILES
- src/MyGUI_Any.cpp
- src/MyGUI_Colour.cpp
-)
-SOURCE_GROUP("Source Files\\Core\\Manager" FILES
- src/MyGUI_ClipboardManager.cpp
- src/MyGUI_ControllerManager.cpp
- src/MyGUI_DataManager.cpp
- src/MyGUI_DynLibManager.cpp
- src/MyGUI_FactoryManager.cpp
- src/MyGUI_FontManager.cpp
- src/MyGUI_Gui.cpp
- src/MyGUI_InputManager.cpp
- src/MyGUI_LanguageManager.cpp
- src/MyGUI_LayerManager.cpp
- src/MyGUI_LayoutManager.cpp
- src/MyGUI_PluginManager.cpp
- src/MyGUI_PointerManager.cpp
- src/MyGUI_RenderManager.cpp
- src/MyGUI_ResourceManager.cpp
- src/MyGUI_SkinManager.cpp
- src/MyGUI_SubWidgetManager.cpp
- src/MyGUI_WidgetManager.cpp
-)
-SOURCE_GROUP("Source Files\\Core" FILES
-)
-SOURCE_GROUP("Source Files\\Utility\\Logging" FILES
- src/MyGUI_LogManager.cpp
- src/MyGUI_LogStream.cpp
-)
-SOURCE_GROUP("Source Files\\Utility" FILES
- src/MyGUI_DataFileStream.cpp
- src/MyGUI_DataStream.cpp
- src/MyGUI_DynLib.cpp
- src/MyGUI_Guid.cpp
- src/MyGUI_RenderOut.cpp
- src/MyGUI_TextIterator.cpp
- src/MyGUI_TextureUtility.cpp
- src/MyGUI_Timer.cpp
- src/MyGUI_XmlDocument.cpp
-)
-SOURCE_GROUP("Source Files" FILES
-)
-SOURCE_GROUP("Header Files\\Widget\\Types" FILES
- include/MyGUI_DDItemInfo.h
- include/MyGUI_IBItemInfo.h
- include/MyGUI_MenuItemType.h
- include/MyGUI_MessageStyle.h
- include/MyGUI_WidgetToolTip.h
-)
-SOURCE_GROUP("Header Files\\Widget\\Widget" FILES
- include/MyGUI_Button.h
- include/MyGUI_Canvas.h
- include/MyGUI_ComboBox.h
- include/MyGUI_DDContainer.h
- include/MyGUI_Edit.h
- include/MyGUI_HScroll.h
- include/MyGUI_ItemBox.h
- include/MyGUI_List.h
- include/MyGUI_ListBox.h
- include/MyGUI_ListCtrl.h
- include/MyGUI_MenuBar.h
- include/MyGUI_MenuCtrl.h
- include/MyGUI_MenuItem.h
- include/MyGUI_Message.h
- include/MyGUI_MultiList.h
- include/MyGUI_PopupMenu.h
- include/MyGUI_Progress.h
- include/MyGUI_ScrollView.h
- include/MyGUI_StaticImage.h
- include/MyGUI_StaticText.h
- include/MyGUI_Tab.h
- include/MyGUI_TabItem.h
- include/MyGUI_VScroll.h
- include/MyGUI_Widget.h
- include/MyGUI_Window.h
-)
-SOURCE_GROUP("Header Files\\Widget\\Interfaces" FILES
- include/MyGUI_IWidgetFactory.h
-)
-SOURCE_GROUP("Header Files\\Widget" FILES
-)
-SOURCE_GROUP("Header Files\\Utility\\Logging" FILES
- include/MyGUI_LogManager.h
- include/MyGUI_LogStream.h
-)
-SOURCE_GROUP("Header Files\\Utility" FILES
- include/MyGUI_Bitwise.h
- include/MyGUI_CoordConverter.h
- include/MyGUI_DataFileStream.h
- include/MyGUI_DataStream.h
- include/MyGUI_Delegate.h
- include/MyGUI_DelegateImplement.h
- include/MyGUI_DynLib.h
- include/MyGUI_Enumerator.h
- include/MyGUI_EventPair.h
- include/MyGUI_Guid.h
- include/MyGUI_RenderOut.h
- include/MyGUI_TextChangeHistory.h
- include/MyGUI_TextIterator.h
- include/MyGUI_TextureUtility.h
- include/MyGUI_TextView.h
- include/MyGUI_Timer.h
- include/MyGUI_UString.h
- include/MyGUI_Utility.h
- include/MyGUI_WidgetTranslate.h
- include/MyGUI_XmlDocument.h
-)
-SOURCE_GROUP("Header Files\\Core\\Common\\Interfaces" FILES
- include/MyGUI_ICroppedRectangle.h
- include/MyGUI_IDataStream.h
- include/MyGUI_Instance.h
- include/MyGUI_IObject.h
- include/MyGUI_ISerializable.h
- include/MyGUI_ITexture.h
- include/MyGUI_IUnlinkWidget.h
- include/MyGUI_IVertexBuffer.h
- include/MyGUI_IWidgetCreator.h
- include/MyGUI_Plugin.h
- include/MyGUI_RTTI.h
-)
-SOURCE_GROUP("Header Files\\Core\\Common\\Base" FILES
- include/MyGUI_BiIndexBase.h
- include/MyGUI_ScrollViewBase.h
- include/MyGUI_WidgetEvent.h
- include/MyGUI_WidgetUserData.h
-)
-SOURCE_GROUP("Header Files\\Core\\Common" FILES
- include/MyGUI.h
- include/MyGUI_CastWidget.h
- include/MyGUI_Common.h
- include/MyGUI_Diagnostic.h
- include/MyGUI_Exception.h
- include/MyGUI_GenericFactory.h
- include/MyGUI_Macros.h
- include/MyGUI_Platform.h
- include/MyGUI_Precompiled.h
- include/MyGUI_Prerequest.h
- include/MyGUI_RenderFormat.h
- include/MyGUI_ResourceHolder.h
- include/MyGUI_WidgetDefines.h
-)
-SOURCE_GROUP("Header Files\\Core\\SubWidget\\Interfaces" FILES
- include/MyGUI_IStateInfo.h
- include/MyGUI_ISubWidget.h
- include/MyGUI_ISubWidgetRect.h
- include/MyGUI_ISubWidgetText.h
-)
-SOURCE_GROUP("Header Files\\Core\\SubWidget" FILES
- include/MyGUI_EditText.h
- include/MyGUI_MainSkin.h
- include/MyGUI_RawRect.h
- include/MyGUI_RotatingSkin.h
- include/MyGUI_SimpleText.h
- include/MyGUI_SubSkin.h
- include/MyGUI_TileRect.h
-)
-SOURCE_GROUP("Header Files\\Core\\LayerItem\\Interfaces" FILES
- include/MyGUI_ILayer.h
- include/MyGUI_ILayerItem.h
- include/MyGUI_ILayerNode.h
- include/MyGUI_IRenderTarget.h
-)
-SOURCE_GROUP("Header Files\\Core\\LayerItem" FILES
- include/MyGUI_LayerItem.h
- include/MyGUI_LayerNode.h
- include/MyGUI_OverlappedLayer.h
- include/MyGUI_RenderItem.h
- include/MyGUI_SharedLayer.h
- include/MyGUI_SharedLayerNode.h
-)
-SOURCE_GROUP("Header Files\\Core\\Controller" FILES
- include/MyGUI_ActionController.h
- include/MyGUI_ControllerEdgeHide.h
- include/MyGUI_ControllerFadeAlpha.h
- include/MyGUI_ControllerItem.h
- include/MyGUI_ControllerPosition.h
-)
-SOURCE_GROUP("Header Files\\Core\\Resource\\Interface" FILES
- include/MyGUI_IFont.h
- include/MyGUI_IPointer.h
- include/MyGUI_IResource.h
-)
-SOURCE_GROUP("Header Files\\Core\\Resource\\Data" FILES
- include/MyGUI_ChildSkinInfo.h
- include/MyGUI_FontData.h
- include/MyGUI_MaskPickInfo.h
- include/MyGUI_SubWidgetBinding.h
- include/MyGUI_SubWidgetInfo.h
-)
-SOURCE_GROUP("Header Files\\Core\\Resource" FILES
- include/MyGUI_ResourceImageSet.h
- include/MyGUI_ResourceImageSetPointer.h
- include/MyGUI_ResourceManualFont.h
- include/MyGUI_ResourceManualPointer.h
- include/MyGUI_ResourceSkin.h
- include/MyGUI_ResourceTrueTypeFont.h
-)
-SOURCE_GROUP("Header Files\\Core\\Types" FILES
- include/MyGUI_Align.h
- include/MyGUI_Any.h
- include/MyGUI_Colour.h
- include/MyGUI_CommonStateInfo.h
- include/MyGUI_ImageInfo.h
- include/MyGUI_InputDefine.h
- include/MyGUI_RenderTargetInfo.h
- include/MyGUI_TCoord.h
- include/MyGUI_TPoint.h
- include/MyGUI_TRect.h
- include/MyGUI_TSize.h
- include/MyGUI_Types.h
- include/MyGUI_Version.h
- include/MyGUI_VertexData.h
- include/MyGUI_WidgetStyle.h
-)
-SOURCE_GROUP("Header Files\\Core\\Manager" FILES
- include/MyGUI_ClipboardManager.h
- include/MyGUI_ControllerManager.h
- include/MyGUI_DataManager.h
- include/MyGUI_DynLibManager.h
- include/MyGUI_FactoryManager.h
- include/MyGUI_FontManager.h
- include/MyGUI_Gui.h
- include/MyGUI_InputManager.h
- include/MyGUI_LanguageManager.h
- include/MyGUI_LayerManager.h
- include/MyGUI_LayoutManager.h
- include/MyGUI_PluginManager.h
- include/MyGUI_PointerManager.h
- include/MyGUI_RenderManager.h
- include/MyGUI_ResourceManager.h
- include/MyGUI_SkinManager.h
- include/MyGUI_SubWidgetManager.h
- include/MyGUI_WidgetManager.h
-)
-SOURCE_GROUP("Header Files\\Core" FILES
-)
-SOURCE_GROUP("Header Files" FILES
- include/MyGUI_Allocator.h
- include/MyGUI_CustomAllocator.h
-)
-SOURCE_GROUP("" FILES
- CMakeLists.txt
-)
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI.h
deleted file mode 100644
index db960fc8b..000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*!
- @file
- @author Georgiy Evmenov
- @date 01/2008
- @module
-*/
-/*
- This file is part of MyGUI.
-
- MyGUI is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- MyGUI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with MyGUI. If not, see .
-*/
-#ifndef __MYGUI_H__
-#define __MYGUI_H__
-
-#include "MyGUI_Gui.h"
-
-#include "MyGUI_Button.h"
-#include "MyGUI_ComboBox.h"
-#include "MyGUI_Edit.h"
-#include "MyGUI_HScroll.h"
-#include "MyGUI_List.h"
-#include "MyGUI_StaticText.h"
-#include "MyGUI_StaticImage.h"
-#include "MyGUI_Tab.h"
-#include "MyGUI_TabItem.h"
-#include "MyGUI_VScroll.h"
-#include "MyGUI_Window.h"
-#include "MyGUI_Progress.h"
-#include "MyGUI_Message.h"
-#include "MyGUI_ItemBox.h"
-#include "MyGUI_MultiList.h"
-#include "MyGUI_MenuCtrl.h"
-#include "MyGUI_MenuItem.h"
-#include "MyGUI_PopupMenu.h"
-#include "MyGUI_MenuBar.h"
-#include "MyGUI_ScrollView.h"
-#include "MyGUI_DDContainer.h"
-#include "MyGUI_Canvas.h"
-#include "MyGUI_ListCtrl.h"
-#include "MyGUI_ListBox.h"
-
-#include "MyGUI_InputManager.h"
-#include "MyGUI_SubWidgetManager.h"
-#include "MyGUI_ClipboardManager.h"
-#include "MyGUI_LayerManager.h"
-#include "MyGUI_LogManager.h"
-#include "MyGUI_SkinManager.h"
-#include "MyGUI_WidgetManager.h"
-#include "MyGUI_LayoutManager.h"
-#include "MyGUI_FontManager.h"
-#include "MyGUI_PointerManager.h"
-#include "MyGUI_PluginManager.h"
-#include "MyGUI_DynLibManager.h"
-#include "MyGUI_ControllerManager.h"
-#include "MyGUI_LanguageManager.h"
-#include "MyGUI_ResourceManager.h"
-#include "MyGUI_RenderManager.h"
-#include "MyGUI_DataManager.h"
-#include "MyGUI_FactoryManager.h"
-
-#include "MyGUI_ActionController.h"
-#include "MyGUI_ControllerEdgeHide.h"
-#include "MyGUI_ControllerFadeAlpha.h"
-#include "MyGUI_ControllerPosition.h"
-#include "MyGUI_CoordConverter.h"
-#include "MyGUI_IResource.h"
-#include "MyGUI_CastWidget.h"
-#include "MyGUI_Any.h"
-#include "MyGUI_MenuItemType.h"
-#include "MyGUI_Version.h"
-#include "MyGUI_XmlDocument.h"
-#include "MyGUI_WidgetStyle.h"
-#include "MyGUI_IObject.h"
-#include "MyGUI_ISerializable.h"
-#include "MyGUI_RenderOut.h"
-
-#include "MyGUI_RawRect.h"
-#include "MyGUI_RotatingSkin.h"
-#include "MyGUI_TextureUtility.h"
-
-#endif // __MYGUI_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ActionController.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ActionController.h
deleted file mode 100644
index 7f89b4fd3..000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_ActionController.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
- @file
- @author Albert Semenov
- @date 01/2008
- @module
-*/
-/*
- This file is part of MyGUI.
-
- MyGUI is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- MyGUI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with MyGUI. If not, see .
-*/
-#ifndef __MYGUI_ACTION_CONTROLLER_H__
-#define __MYGUI_ACTION_CONTROLLER_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Types.h"
-#include
-
-namespace MyGUI
-{
-
- namespace action
- {
-
- /** Function used for hiding widget with one of controller event */
- void MYGUI_EXPORT actionWidgetHide(Widget* _widget);
-
- /** Function used for showing widget with one of controller event */
- void MYGUI_EXPORT actionWidgetShow(Widget* _widget);
-
- /** Function used for destroying widget with one of controller event */
- void MYGUI_EXPORT actionWidgetDestroy(Widget* _widget);
-
- /** Function for ControllerPosition per frame action : Move with constant speed */
- void MYGUI_EXPORT linearMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _k);
-
- /** Function for ControllerPosition per frame action : Move with accelerated speed
- if N == 10 then this function is same as linearMoveFunction
- if N > 10 speed will be increasing
- if N < 10 speed will be decreasing
- */
- template
- inline void acceleratedMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _current_time)
- {
- float k = (float)pow (_current_time, N/10.f /*3 by default as Accelerated and 0.4 by default as Slowed*/);
- linearMoveFunction(_startRect, _destRect, _result, k);
- }
-
- /** Function for ControllerPosition per frame action : Move with accelerated speed a bit farther than necessary and then return it back */
- template
- inline void jumpMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _current_time)
- {
- float k = pow (_current_time, 2) * (-2 - N/10.f) + _current_time * (3 + N/10.f);
- linearMoveFunction(_startRect, _destRect, _result, k);
- }
-
- /** Function for ControllerPosition per frame action : Start with zero speed increasing half time and then decreasing to zero */
- void MYGUI_EXPORT inertionalMoveFunction(const IntCoord& _startRect, const IntCoord& _destRect, IntCoord& _result, float _current_time);
-
- } // namespace action
-
-} // namespace MyGUI
-
-#endif // __MYGUI_ACTION_CONTROLLER_H__
diff --git a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Align.h b/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Align.h
deleted file mode 100644
index ca1e6c64a..000000000
--- a/extern/mygui_3.0.1/MyGUIEngine/include/MyGUI_Align.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*!
- @file
- @author Albert Semenov
- @date 08/2008
- @module
-*/
-/*
- This file is part of MyGUI.
-
- MyGUI is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- MyGUI is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with MyGUI. If not, see .
-*/
-#ifndef __MYGUI_ALIGN_H__
-#define __MYGUI_ALIGN_H__
-
-#include "MyGUI_Prerequest.h"
-#include "MyGUI_Macros.h"
-#include "MyGUI_Diagnostic.h"
-#include