diff options
| -rw-r--r-- | CruUI-Generate/cru_ui.cpp | 100 | ||||
| -rw-r--r-- | CruUI-Generate/cru_ui.hpp | 116 | ||||
| -rw-r--r-- | CruUI.sln | 5 | ||||
| -rw-r--r-- | scripts/merge.py | 13 | ||||
| -rw-r--r-- | tools/cppmerge/main.py | 1 |
5 files changed, 126 insertions, 109 deletions
diff --git a/CruUI-Generate/cru_ui.cpp b/CruUI-Generate/cru_ui.cpp index 52e8aec3..3036989d 100644 --- a/CruUI-Generate/cru_ui.cpp +++ b/CruUI-Generate/cru_ui.cpp @@ -1,6 +1,6 @@ #include "cru_ui.hpp" //-------------------------------------------------------- -//-------begin of file: ..\..\src\any_map.cpp +//-------begin of file: src\any_map.cpp //-------------------------------------------------------- namespace cru @@ -35,10 +35,10 @@ namespace cru } } //-------------------------------------------------------- -//-------end of file: ..\..\src\any_map.cpp +//-------end of file: src\any_map.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\application.cpp +//-------begin of file: src\application.cpp //-------------------------------------------------------- @@ -179,10 +179,10 @@ namespace cru { } } //-------------------------------------------------------- -//-------end of file: ..\..\src\application.cpp +//-------end of file: src\application.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\base.cpp +//-------begin of file: src\base.cpp //-------------------------------------------------------- @@ -202,10 +202,10 @@ namespace cru } } //-------------------------------------------------------- -//-------end of file: ..\..\src\base.cpp +//-------end of file: src\base.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\cru_debug.cpp +//-------begin of file: src\cru_debug.cpp //-------------------------------------------------------- @@ -217,10 +217,10 @@ namespace cru::debug } } //-------------------------------------------------------- -//-------end of file: ..\..\src\cru_debug.cpp +//-------end of file: src\cru_debug.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\exception.cpp +//-------begin of file: src\exception.cpp //-------------------------------------------------------- @@ -261,10 +261,10 @@ namespace cru } } //-------------------------------------------------------- -//-------end of file: ..\..\src\exception.cpp +//-------end of file: src\exception.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\main.cpp +//-------begin of file: src\main.cpp //-------------------------------------------------------- using cru::String; @@ -474,10 +474,10 @@ int APIENTRY wWinMain( return application.Run(); } //-------------------------------------------------------- -//-------end of file: ..\..\src\main.cpp +//-------end of file: src\main.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\timer.cpp +//-------begin of file: src\timer.cpp //-------------------------------------------------------- @@ -541,10 +541,10 @@ namespace cru } } //-------------------------------------------------------- -//-------end of file: ..\..\src\timer.cpp +//-------end of file: src\timer.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\graph\graph.cpp +//-------begin of file: src\graph\graph.cpp //-------------------------------------------------------- @@ -763,10 +763,10 @@ namespace cru::graph } } //-------------------------------------------------------- -//-------end of file: ..\..\src\graph\graph.cpp +//-------end of file: src\graph\graph.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\border_property.cpp +//-------begin of file: src\ui\border_property.cpp //-------------------------------------------------------- @@ -790,10 +790,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\border_property.cpp +//-------end of file: src\ui\border_property.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\control.cpp +//-------begin of file: src\ui\control.cpp //-------------------------------------------------------- #include <algorithm> @@ -1774,10 +1774,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\control.cpp +//-------end of file: src\ui\control.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\cursor.cpp +//-------begin of file: src\ui\cursor.cpp //-------------------------------------------------------- @@ -1803,10 +1803,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\cursor.cpp +//-------end of file: src\ui\cursor.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\layout_base.cpp +//-------begin of file: src\ui\layout_base.cpp //-------------------------------------------------------- @@ -1889,10 +1889,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\layout_base.cpp +//-------end of file: src\ui\layout_base.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\ui_base.cpp +//-------begin of file: src\ui\ui_base.cpp //-------------------------------------------------------- @@ -1916,10 +1916,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\ui_base.cpp +//-------end of file: src\ui\ui_base.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\ui_manager.cpp +//-------begin of file: src\ui\ui_manager.cpp //-------------------------------------------------------- @@ -2020,10 +2020,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\ui_manager.cpp +//-------end of file: src\ui\ui_manager.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\window.cpp +//-------begin of file: src\ui\window.cpp //-------------------------------------------------------- @@ -2799,10 +2799,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\window.cpp +//-------end of file: src\ui\window.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\animations\animation.cpp +//-------begin of file: src\ui\animations\animation.cpp //-------------------------------------------------------- #include <utility> @@ -2975,10 +2975,10 @@ namespace cru::ui::animations } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\animations\animation.cpp +//-------end of file: src\ui\animations\animation.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\button.cpp +//-------begin of file: src\ui\controls\button.cpp //-------------------------------------------------------- @@ -3012,10 +3012,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\button.cpp +//-------end of file: src\ui\controls\button.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\linear_layout.cpp +//-------begin of file: src\ui\controls\linear_layout.cpp //-------------------------------------------------------- #include <algorithm> @@ -3176,10 +3176,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\linear_layout.cpp +//-------end of file: src\ui\controls\linear_layout.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\list_item.cpp +//-------begin of file: src\ui\controls\list_item.cpp //-------------------------------------------------------- @@ -3241,10 +3241,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\list_item.cpp +//-------end of file: src\ui\controls\list_item.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\popup_menu.cpp +//-------begin of file: src\ui\controls\popup_menu.cpp //-------------------------------------------------------- @@ -3299,10 +3299,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\popup_menu.cpp +//-------end of file: src\ui\controls\popup_menu.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\text_block.cpp +//-------begin of file: src\ui\controls\text_block.cpp //-------------------------------------------------------- @@ -3322,10 +3322,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\text_block.cpp +//-------end of file: src\ui\controls\text_block.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\text_box.cpp +//-------begin of file: src\ui\controls\text_box.cpp //-------------------------------------------------------- #include <cwctype> @@ -3526,10 +3526,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\text_box.cpp +//-------end of file: src\ui\controls\text_box.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\text_control.cpp +//-------begin of file: src\ui\controls\text_control.cpp //-------------------------------------------------------- #include <cassert> @@ -3780,10 +3780,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\text_control.cpp +//-------end of file: src\ui\controls\text_control.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\toggle_button.cpp +//-------begin of file: src\ui\controls\toggle_button.cpp //-------------------------------------------------------- @@ -3913,10 +3913,10 @@ namespace cru::ui::controls } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\toggle_button.cpp +//-------end of file: src\ui\controls\toggle_button.cpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\events\ui_event.cpp +//-------begin of file: src\ui\events\ui_event.cpp //-------------------------------------------------------- @@ -3930,5 +3930,5 @@ namespace cru::ui::events } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\events\ui_event.cpp +//-------end of file: src\ui\events\ui_event.cpp //-------------------------------------------------------- diff --git a/CruUI-Generate/cru_ui.hpp b/CruUI-Generate/cru_ui.hpp index 9941533e..d6df9b13 100644 --- a/CruUI-Generate/cru_ui.hpp +++ b/CruUI-Generate/cru_ui.hpp @@ -1,6 +1,6 @@ #pragma once //-------------------------------------------------------- -//-------begin of file: ..\..\src\any_map.hpp +//-------begin of file: src\any_map.hpp //-------------------------------------------------------- #include <any> @@ -10,12 +10,12 @@ #include <typeinfo> //-------------------------------------------------------- -//-------begin of file: ..\..\src\base.hpp +//-------begin of file: src\base.hpp //-------------------------------------------------------- // ReSharper disable once CppUnusedIncludeDirective //-------------------------------------------------------- -//-------begin of file: ..\..\src\global_macros.hpp +//-------begin of file: src\global_macros.hpp //-------------------------------------------------------- #ifdef _DEBUG @@ -26,7 +26,7 @@ #define CRU_DEBUG_LAYOUT #endif //-------------------------------------------------------- -//-------end of file: ..\..\src\global_macros.hpp +//-------end of file: src\global_macros.hpp //-------------------------------------------------------- @@ -115,10 +115,10 @@ namespace cru } //-------------------------------------------------------- -//-------end of file: ..\..\src\base.hpp +//-------end of file: src\base.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\format.hpp +//-------begin of file: src\format.hpp //-------------------------------------------------------- @@ -226,7 +226,7 @@ namespace cru } } //-------------------------------------------------------- -//-------end of file: ..\..\src\format.hpp +//-------end of file: src\format.hpp //-------------------------------------------------------- @@ -319,14 +319,14 @@ namespace cru }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\any_map.hpp +//-------end of file: src\any_map.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\application.hpp +//-------begin of file: src\application.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\system_headers.hpp +//-------begin of file: src\system_headers.hpp //-------------------------------------------------------- @@ -349,7 +349,7 @@ namespace cru #include <dxgi1_2.h> #include <wrl/client.h> //-------------------------------------------------------- -//-------end of file: ..\..\src\system_headers.hpp +//-------end of file: src\system_headers.hpp //-------------------------------------------------------- #include <memory> #include <optional> @@ -463,10 +463,10 @@ namespace cru void InvokeLater(const std::function<void()>& action); } //-------------------------------------------------------- -//-------end of file: ..\..\src\application.hpp +//-------end of file: src\application.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\exception.hpp +//-------begin of file: src\exception.hpp //-------------------------------------------------------- #include <optional> @@ -523,10 +523,10 @@ namespace cru { }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\exception.hpp +//-------end of file: src\exception.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\timer.hpp +//-------begin of file: src\timer.hpp //-------------------------------------------------------- @@ -588,10 +588,10 @@ namespace cru TimerTask SetInterval(std::chrono::milliseconds milliseconds, const TimerAction& action); } //-------------------------------------------------------- -//-------end of file: ..\..\src\timer.hpp +//-------end of file: src\timer.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\window.hpp +//-------begin of file: src\ui\window.hpp //-------------------------------------------------------- #include <map> @@ -599,7 +599,7 @@ namespace cru #include <memory> //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\control.hpp +//-------begin of file: src\ui\control.hpp //-------------------------------------------------------- #include <unordered_map> @@ -607,7 +607,7 @@ namespace cru #include <utility> //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\ui_base.hpp +//-------begin of file: src\ui\ui_base.hpp //-------------------------------------------------------- #include <optional> @@ -811,10 +811,10 @@ namespace cru::ui bool IsAnyMouseButtonDown(); } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\ui_base.hpp +//-------end of file: src\ui\ui_base.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\layout_base.hpp +//-------begin of file: src\ui\layout_base.hpp //-------------------------------------------------------- #include <unordered_set> @@ -956,16 +956,16 @@ namespace cru::ui }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\layout_base.hpp +//-------end of file: src\ui\layout_base.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\events\ui_event.hpp +//-------begin of file: src\ui\events\ui_event.hpp //-------------------------------------------------------- #include <optional> //-------------------------------------------------------- -//-------begin of file: ..\..\src\cru_event.hpp +//-------begin of file: src\cru_event.hpp //-------------------------------------------------------- #include <type_traits> @@ -1052,7 +1052,7 @@ namespace cru { }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\cru_event.hpp +//-------end of file: src\cru_event.hpp //-------------------------------------------------------- namespace cru::ui @@ -1361,10 +1361,10 @@ namespace cru::ui::events using CharEvent = Event<CharEventArgs>; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\events\ui_event.hpp +//-------end of file: src\ui\events\ui_event.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\border_property.hpp +//-------begin of file: src\ui\border_property.hpp //-------------------------------------------------------- @@ -1448,10 +1448,10 @@ namespace cru::ui }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\border_property.hpp +//-------end of file: src\ui\border_property.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\cursor.hpp +//-------begin of file: src\ui\cursor.hpp //-------------------------------------------------------- #include <memory> @@ -1489,7 +1489,7 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\cursor.hpp +//-------end of file: src\ui\cursor.hpp //-------------------------------------------------------- namespace cru::ui @@ -1902,7 +1902,7 @@ namespace cru::ui using ControlList = std::initializer_list<Control*>; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\control.hpp +//-------end of file: src\ui\control.hpp //-------------------------------------------------------- namespace cru::graph @@ -2231,10 +2231,10 @@ namespace cru::ui }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\window.hpp +//-------end of file: src\ui\window.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\cru_debug.hpp +//-------begin of file: src\cru_debug.hpp //-------------------------------------------------------- #include <functional> @@ -2278,10 +2278,10 @@ namespace cru::debug #endif } //-------------------------------------------------------- -//-------end of file: ..\..\src\cru_debug.hpp +//-------end of file: src\cru_debug.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\linear_layout.hpp +//-------begin of file: src\ui\controls\linear_layout.hpp //-------------------------------------------------------- @@ -2329,14 +2329,14 @@ namespace cru::ui::controls }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\linear_layout.hpp +//-------end of file: src\ui\controls\linear_layout.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\text_block.hpp +//-------begin of file: src\ui\controls\text_block.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\text_control.hpp +//-------begin of file: src\ui\controls\text_control.hpp //-------------------------------------------------------- @@ -2438,7 +2438,7 @@ namespace cru::ui::controls }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\text_control.hpp +//-------end of file: src\ui\controls\text_control.hpp //-------------------------------------------------------- namespace cru::ui::controls @@ -2470,10 +2470,10 @@ namespace cru::ui::controls }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\text_block.hpp +//-------end of file: src\ui\controls\text_block.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\toggle_button.hpp +//-------begin of file: src\ui\controls\toggle_button.hpp //-------------------------------------------------------- @@ -2539,10 +2539,10 @@ namespace cru::ui::controls }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\toggle_button.hpp +//-------end of file: src\ui\controls\toggle_button.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\button.hpp +//-------begin of file: src\ui\controls\button.hpp //-------------------------------------------------------- #include <initializer_list> @@ -2585,10 +2585,10 @@ namespace cru::ui::controls }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\button.hpp +//-------end of file: src\ui\controls\button.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\text_box.hpp +//-------begin of file: src\ui\controls\text_box.hpp //-------------------------------------------------------- @@ -2640,10 +2640,10 @@ namespace cru::ui::controls }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\text_box.hpp +//-------end of file: src\ui\controls\text_box.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\list_item.hpp +//-------begin of file: src\ui\controls\list_item.hpp //-------------------------------------------------------- #include <map> @@ -2711,10 +2711,10 @@ namespace cru::ui::controls }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\list_item.hpp +//-------end of file: src\ui\controls\list_item.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\controls\popup_menu.hpp +//-------begin of file: src\ui\controls\popup_menu.hpp //-------------------------------------------------------- #include <vector> @@ -2734,10 +2734,10 @@ namespace cru::ui::controls Window* CreatePopupMenu(const Point& anchor, const std::vector<MenuItemInfo>& items, Window* parent = nullptr); } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\controls\popup_menu.hpp +//-------end of file: src\ui\controls\popup_menu.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\graph\graph.hpp +//-------begin of file: src\graph\graph.hpp //-------------------------------------------------------- #include <memory> @@ -2912,10 +2912,10 @@ namespace cru::graph } } //-------------------------------------------------------- -//-------end of file: ..\..\src\graph\graph.hpp +//-------end of file: src\graph\graph.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\ui_manager.hpp +//-------begin of file: src\ui\ui_manager.hpp //-------------------------------------------------------- @@ -3015,10 +3015,10 @@ namespace cru::ui }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\ui_manager.hpp +//-------end of file: src\ui\ui_manager.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\convert_util.hpp +//-------begin of file: src\ui\convert_util.hpp //-------------------------------------------------------- @@ -3031,10 +3031,10 @@ namespace cru::ui } } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\convert_util.hpp +//-------end of file: src\ui\convert_util.hpp //-------------------------------------------------------- //-------------------------------------------------------- -//-------begin of file: ..\..\src\ui\animations\animation.hpp +//-------begin of file: src\ui\animations\animation.hpp //-------------------------------------------------------- #include <unordered_map> @@ -3161,5 +3161,5 @@ namespace cru::ui::animations }; } //-------------------------------------------------------- -//-------end of file: ..\..\src\ui\animations\animation.hpp +//-------end of file: src\ui\animations\animation.hpp //-------------------------------------------------------- @@ -5,7 +5,10 @@ VisualStudioVersion = 15.0.28010.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI", "CruUI.vcxproj", "{A987AC8E-C365-44F3-8324-CBA95B33AB97}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI-Generate", "CruUI-Generate/CruUI-Generate.vcxproj", "{E823676A-8860-4177-B062-B003B7F66A6F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI-Generate", "CruUI-Generate\CruUI-Generate.vcxproj", "{E823676A-8860-4177-B062-B003B7F66A6F}" + ProjectSection(ProjectDependencies) = postProject + {A987AC8E-C365-44F3-8324-CBA95B33AB97} = {A987AC8E-C365-44F3-8324-CBA95B33AB97} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/scripts/merge.py b/scripts/merge.py new file mode 100644 index 00000000..250dfecb --- /dev/null +++ b/scripts/merge.py @@ -0,0 +1,13 @@ +import os +import os.path + +script_dir = os.path.dirname(os.path.realpath(__file__)) + +tool_path =os.path.relpath(os.path.join(script_dir, '../tools/cppmerge/main.py')) +input_dir = os.path.relpath(os.path.join(script_dir, '../src')) +output_path = os.path.relpath(os.path.join(script_dir, '../CruUI-Generate/cru_ui')) + +print('Input dir is {}'.format(input_dir)) +print('Output path is {}'.format(output_path)) + +os.system('python {} -o {} {}'.format(tool_path, output_path, input_dir)) diff --git a/tools/cppmerge/main.py b/tools/cppmerge/main.py index 76966a47..6c73ff0d 100644 --- a/tools/cppmerge/main.py +++ b/tools/cppmerge/main.py @@ -133,6 +133,7 @@ output_source_file.write('#include "{}"\n'.format(os.path.basename(output_header for source_path in source_file_list: + source_path = os.path.normpath(source_path) output_source_file.write("//--------------------------------------------------------\n") output_source_file.write("//-------begin of file: {}\n".format(source_path)) output_source_file.write("//--------------------------------------------------------\n") |