diff --git a/CMakeLists.txt b/CMakeLists.txt index e8152f2f9..3e97b5858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,7 @@ if(APPLE) "Plugin_ParticleFX") endif(APPLE) -add_subdirectory( extern/mygui_3.0.1 ) +add_subdirectory( files/mygui ) # Specify build paths diff --git a/extern/mygui_3.0.1/COPYING.LESSER b/extern/mygui_3.0.1/COPYING.LESSER deleted file mode 100644 index fc8a5de7e..000000000 --- a/extern/mygui_3.0.1/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/files/mygui/CMakeLists.txt similarity index 98% rename from extern/mygui_3.0.1/CMakeLists.txt rename to files/mygui/CMakeLists.txt index b746587f5..9ea84747c 100644 --- a/extern/mygui_3.0.1/CMakeLists.txt +++ b/files/mygui/CMakeLists.txt @@ -1,7 +1,7 @@ # Minimal MyGUI build system for OpenMW # Copy resource files into the build directory -set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}/openmw_resources) +set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}) set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui) configure_file("${SDIR}/bigbars.png" "${DDIR}/bigbars.png" COPYONLY) diff --git a/extern/mygui_3.0.1/openmw_resources/Comic.TTF b/files/mygui/Comic.TTF similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/Comic.TTF rename to files/mygui/Comic.TTF diff --git a/extern/mygui_3.0.1/openmw_resources/VeraMono.ttf b/files/mygui/VeraMono.ttf similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/VeraMono.ttf rename to files/mygui/VeraMono.ttf diff --git a/extern/mygui_3.0.1/openmw_resources/bigbars.png b/files/mygui/bigbars.png similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/bigbars.png rename to files/mygui/bigbars.png diff --git a/extern/mygui_3.0.1/openmw_resources/black.png b/files/mygui/black.png similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/black.png rename to files/mygui/black.png diff --git a/extern/mygui_3.0.1/openmw_resources/core.skin b/files/mygui/core.skin similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/core.skin rename to files/mygui/core.skin diff --git a/extern/mygui_3.0.1/openmw_resources/core.xml b/files/mygui/core.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/core.xml rename to files/mygui/core.xml diff --git a/extern/mygui_3.0.1/openmw_resources/mwgui.png b/files/mygui/mwgui.png similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/mwgui.png rename to files/mygui/mwgui.png diff --git a/extern/mygui_3.0.1/openmw_resources/mwpointer.png b/files/mygui/mwpointer.png similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/mwpointer.png rename to files/mygui/mwpointer.png diff --git a/extern/mygui_3.0.1/openmw_resources/openmw.font.xml b/files/mygui/openmw.font.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw.font.xml rename to files/mygui/openmw.font.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml b/files/mygui/openmw.pointer.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml rename to files/mygui/openmw.pointer.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_box.skin.xml b/files/mygui/openmw_box.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_box.skin.xml rename to files/mygui/openmw_box.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_button.skin.xml b/files/mygui/openmw_button.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_button.skin.xml rename to files/mygui/openmw_button.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml b/files/mygui/openmw_chargen_birth_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_birth_layout.xml rename to files/mygui/openmw_chargen_birth_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml b/files/mygui/openmw_chargen_class_description_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml rename to files/mygui/openmw_chargen_class_description_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml b/files/mygui/openmw_chargen_class_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_layout.xml rename to files/mygui/openmw_chargen_class_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml b/files/mygui/openmw_chargen_create_class_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml rename to files/mygui/openmw_chargen_create_class_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_generate_class_result_layout.xml b/files/mygui/openmw_chargen_generate_class_result_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_generate_class_result_layout.xml rename to files/mygui/openmw_chargen_generate_class_result_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml b/files/mygui/openmw_chargen_race_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml rename to files/mygui/openmw_chargen_race_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml b/files/mygui/openmw_chargen_review_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_review_layout.xml rename to files/mygui/openmw_chargen_review_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_attribute_layout.xml b/files/mygui/openmw_chargen_select_attribute_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_attribute_layout.xml rename to files/mygui/openmw_chargen_select_attribute_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_skill_layout.xml b/files/mygui/openmw_chargen_select_skill_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_skill_layout.xml rename to files/mygui/openmw_chargen_select_skill_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_specialization_layout.xml b/files/mygui/openmw_chargen_select_specialization_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_chargen_select_specialization_layout.xml rename to files/mygui/openmw_chargen_select_specialization_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml b/files/mygui/openmw_console.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml rename to files/mygui/openmw_console.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml b/files/mygui/openmw_console_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml rename to files/mygui/openmw_console_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml b/files/mygui/openmw_dialogue_window_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml rename to files/mygui/openmw_dialogue_window_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml b/files/mygui/openmw_dialogue_window_skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml rename to files/mygui/openmw_dialogue_window_skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml b/files/mygui/openmw_edit.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml rename to files/mygui/openmw_edit.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_hud_box.skin.xml rename to files/mygui/openmw_hud_box.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_hud_energybar.skin.xml rename to files/mygui/openmw_hud_energybar.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml b/files/mygui/openmw_hud_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_hud_layout.xml rename to files/mygui/openmw_hud_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_images.xml b/files/mygui/openmw_images.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_images.xml rename to files/mygui/openmw_images.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_infobox_layout.xml b/files/mygui/openmw_infobox_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_infobox_layout.xml rename to files/mygui/openmw_infobox_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml b/files/mygui/openmw_interactive_messagebox_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml rename to files/mygui/openmw_interactive_messagebox_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml b/files/mygui/openmw_inventory_window_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_inventory_window_layout.xml rename to files/mygui/openmw_inventory_window_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_journal_layout.xml b/files/mygui/openmw_journal_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_journal_layout.xml rename to files/mygui/openmw_journal_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml b/files/mygui/openmw_journal_skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_journal_skin.xml rename to files/mygui/openmw_journal_skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_layers.xml b/files/mygui/openmw_layers.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_layers.xml rename to files/mygui/openmw_layers.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml rename to files/mygui/openmw_list.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_layout.xml b/files/mygui/openmw_mainmenu_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_layout.xml rename to files/mygui/openmw_mainmenu_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_skin.xml b/files/mygui/openmw_mainmenu_skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_mainmenu_skin.xml rename to files/mygui/openmw_mainmenu_skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_map_window_layout.xml b/files/mygui/openmw_map_window_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_map_window_layout.xml rename to files/mygui/openmw_map_window_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml b/files/mygui/openmw_messagebox_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml rename to files/mygui/openmw_messagebox_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_progress.skin.xml rename to files/mygui/openmw_progress.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_settings.xml b/files/mygui/openmw_settings.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_settings.xml rename to files/mygui/openmw_settings.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml b/files/mygui/openmw_stats_window_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_stats_window_layout.xml rename to files/mygui/openmw_stats_window_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_text.skin.xml rename to files/mygui/openmw_text.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml b/files/mygui/openmw_text_input_layout.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml rename to files/mygui/openmw_text_input_layout.xml diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/openmw_windows.skin.xml rename to files/mygui/openmw_windows.skin.xml diff --git a/extern/mygui_3.0.1/openmw_resources/smallbars.png b/files/mygui/smallbars.png similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/smallbars.png rename to files/mygui/smallbars.png diff --git a/extern/mygui_3.0.1/openmw_resources/test.skin b/files/mygui/test.skin similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/test.skin rename to files/mygui/test.skin diff --git a/extern/mygui_3.0.1/openmw_resources/transparent.png b/files/mygui/transparent.png similarity index 100% rename from extern/mygui_3.0.1/openmw_resources/transparent.png rename to files/mygui/transparent.png