Skip to content

Commit 023ec37

Browse files
MaximDudeMaximDude
committed
Namespace change and reorganize all the things
1 parent 88b3688 commit 023ec37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+200
-195
lines changed

‎GUILibrary/GUILibrary.vcxproj

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7575
<LinkIncremental>true</LinkIncremental>
7676
<OutDir>$(SolutionDir)_Bin\</OutDir>
77-
<IntDir>$(SolutionDir)_Bin\$(ProjectName)\$(Configuration)\</IntDir>
77+
<IntDir>$(SolutionDir)\_Bin\$(ProjectName)\$(Configuration)\</IntDir>
7878
<TargetName>RTEGUI.lib.debug</TargetName>
7979
</PropertyGroup>
8080
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -83,7 +83,7 @@
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8484
<LinkIncremental>false</LinkIncremental>
8585
<OutDir>$(SolutionDir)_Bin\</OutDir>
86-
<IntDir>$(SolutionDir)_Bin\$(ProjectName)\$(Configuration)\</IntDir>
86+
<IntDir>$(SolutionDir)\_Bin\$(ProjectName)\$(Configuration)\</IntDir>
8787
<TargetName>RTEGUI.lib.release</TargetName>
8888
</PropertyGroup>
8989
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -92,17 +92,19 @@
9292
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9393
<ClCompile>
9494
<PrecompiledHeader>Use</PrecompiledHeader>
95-
<WarningLevel>Level3</WarningLevel>
95+
<WarningLevel>Level1</WarningLevel>
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
9898
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<ConformanceMode>true</ConformanceMode>
100-
<PrecompiledHeaderFile>LibraryIncludes.h</PrecompiledHeaderFile>
101-
<AdditionalIncludeDirectories>$(SolutionDir)external\include;..\..\Cortex-Command-Community-Project-Source\System;..\..\Cortex-Command-Community-Project-Source\Managers;$(ProjectDir)Source;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102-
<ForcedIncludeFiles>LibraryIncludes.h;</ForcedIncludeFiles>
100+
<PrecompiledHeaderFile>$(ProjectDir)LibraryIncludes.h</PrecompiledHeaderFile>
101+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\include;..\..\Cortex-Command-Community-Project-Source\System;..\..\Cortex-Command-Community-Project-Source\Managers;$(ProjectDir)Include;$(ProjectDir)Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102+
<ForcedIncludeFiles>$(ProjectDir)LibraryIncludes.h;</ForcedIncludeFiles>
103103
<DisableSpecificWarnings>4996;4244;4018;4006;4305;</DisableSpecificWarnings>
104104
<CompileAs>CompileAsCpp</CompileAs>
105105
<CallingConvention>Cdecl</CallingConvention>
106+
<OmitDefaultLibName>true</OmitDefaultLibName>
107+
<LanguageStandard>stdcpp14</LanguageStandard>
106108
</ClCompile>
107109
<Link>
108110
<SubSystem>Windows</SubSystem>
@@ -127,21 +129,23 @@
127129
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
128130
<ClCompile>
129131
<PrecompiledHeader>Use</PrecompiledHeader>
130-
<WarningLevel>Level3</WarningLevel>
132+
<WarningLevel>Level1</WarningLevel>
131133
<Optimization>MaxSpeed</Optimization>
132134
<FunctionLevelLinking>true</FunctionLevelLinking>
133135
<IntrinsicFunctions>true</IntrinsicFunctions>
134136
<SDLCheck>true</SDLCheck>
135137
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136138
<ConformanceMode>true</ConformanceMode>
137-
<PrecompiledHeaderFile>LibraryIncludes.h</PrecompiledHeaderFile>
138-
<AdditionalIncludeDirectories>$(SolutionDir)external\include;..\..\Cortex-Command-Community-Project-Source\System;..\..\Cortex-Command-Community-Project-Source\Managers;$(ProjectDir)Source;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
139-
<ForcedIncludeFiles>LibraryIncludes.h;</ForcedIncludeFiles>
139+
<PrecompiledHeaderFile>$(ProjectDir)LibraryIncludes.h</PrecompiledHeaderFile>
140+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\include;..\..\Cortex-Command-Community-Project-Source\System;..\..\Cortex-Command-Community-Project-Source\Managers;$(ProjectDir)Include;$(ProjectDir)Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
141+
<ForcedIncludeFiles>$(ProjectDir)LibraryIncludes.h;</ForcedIncludeFiles>
140142
<DisableSpecificWarnings>4996;4244;4018;4006;4305;</DisableSpecificWarnings>
141143
<CompileAs>CompileAsCpp</CompileAs>
142144
<CallingConvention>Cdecl</CallingConvention>
143145
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
144146
<OmitFramePointers>true</OmitFramePointers>
147+
<OmitDefaultLibName>true</OmitDefaultLibName>
148+
<LanguageStandard>stdcpp14</LanguageStandard>
145149
</ClCompile>
146150
<Link>
147151
<SubSystem>Windows</SubSystem>
@@ -170,44 +174,42 @@
170174
</Link>
171175
</ItemDefinitionGroup>
172176
<ItemGroup>
177+
<ClInclude Include="Include\GUI.h" />
178+
<ClInclude Include="Include\GUIBanner.h" />
179+
<ClInclude Include="Include\GUIButton.h" />
180+
<ClInclude Include="Include\GUICheckbox.h" />
181+
<ClInclude Include="Include\GUICollectionBox.h" />
182+
<ClInclude Include="Include\GUIComboBox.h" />
183+
<ClInclude Include="Include\GUIControl.h" />
184+
<ClInclude Include="Include\GUIControlFactory.h" />
185+
<ClInclude Include="Include\GUIControlManager.h" />
186+
<ClInclude Include="Include\GUIEvent.h" />
187+
<ClInclude Include="Include\GUIFont.h" />
188+
<ClInclude Include="Include\GUIInput.h" />
189+
<ClInclude Include="Include\GUIInterface.h" />
190+
<ClInclude Include="Include\GUILabel.h" />
191+
<ClInclude Include="Include\GUIListBox.h" />
192+
<ClInclude Include="Include\GUIListPanel.h" />
193+
<ClInclude Include="Include\GUIManager.h" />
194+
<ClInclude Include="Include\GUIPanel.h" />
195+
<ClInclude Include="Include\GUIProgressBar.h" />
196+
<ClInclude Include="Include\GUIProperties.h" />
197+
<ClInclude Include="Include\GUIPropertyPage.h" />
198+
<ClInclude Include="Include\GUIRadioButton.h" />
199+
<ClInclude Include="Include\GUIScrollbar.h" />
200+
<ClInclude Include="Include\GUIScrollPanel.h" />
201+
<ClInclude Include="Include\GUISkin.h" />
202+
<ClInclude Include="Include\GUISlider.h" />
203+
<ClInclude Include="Include\GUITab.h" />
204+
<ClInclude Include="Include\GUITextBox.h" />
205+
<ClInclude Include="Include\GUITextPanel.h" />
206+
<ClInclude Include="Include\GUIUtil.h" />
173207
<ClInclude Include="LibraryIncludes.h" />
174-
<ClInclude Include="Source\GUI.h" />
175-
<ClInclude Include="Source\GUIBanner.h" />
176-
<ClInclude Include="Source\GUIButton.h" />
177-
<ClInclude Include="Source\GUICheckbox.h" />
178-
<ClInclude Include="Source\GUICollectionBox.h" />
179-
<ClInclude Include="Source\GUIComboBox.h" />
180-
<ClInclude Include="Source\GUIControl.h" />
181-
<ClInclude Include="Source\GUIControlFactory.h" />
182-
<ClInclude Include="Source\GUIControlManager.h" />
183-
<ClInclude Include="Source\GUIEvent.h" />
184-
<ClInclude Include="Source\GUIFont.h" />
185-
<ClInclude Include="Source\GUIInput.h" />
186-
<ClInclude Include="Source\GUILabel.h" />
187-
<ClInclude Include="Source\GUIListBox.h" />
188-
<ClInclude Include="Source\GUIListPanel.h" />
189-
<ClInclude Include="Source\GUIManager.h" />
190-
<ClInclude Include="Source\GUIPanel.h" />
191-
<ClInclude Include="Source\GUIProgressBar.h" />
192-
<ClInclude Include="Source\GUIProperties.h" />
193-
<ClInclude Include="Source\GUIPropertyPage.h" />
194-
<ClInclude Include="Source\GUIRadioButton.h" />
195-
<ClInclude Include="Source\GUIScrollbar.h" />
196-
<ClInclude Include="Source\GUIScrollPanel.h" />
197-
<ClInclude Include="Source\GUISkin.h" />
198-
<ClInclude Include="Source\GUISlider.h" />
199-
<ClInclude Include="Source\GUITab.h" />
200-
<ClInclude Include="Source\GUITextBox.h" />
201-
<ClInclude Include="Source\GUITextPanel.h" />
202-
<ClInclude Include="Source\GUIUtil.h" />
203-
<ClInclude Include="Source\GUIInterface.h" />
204208
</ItemGroup>
205209
<ItemGroup>
206210
<ClCompile Include="LibraryIncludes.cpp">
207211
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
208-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
209212
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
210-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
211213
</ClCompile>
212214
<ClCompile Include="Source\GUIBanner.cpp" />
213215
<ClCompile Include="Source\GUIButton.cpp" />

‎GUILibrary/GUILibrary.vcxproj.filters

Lines changed: 63 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,97 +5,100 @@
55
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
66
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
77
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{3b9d188e-4bbc-4d3a-8927-dbcd0dff8ccf}</UniqueIdentifier>
10+
</Filter>
811
</ItemGroup>
912
<ItemGroup>
10-
<ClInclude Include="Source\GUI.h">
11-
<Filter>Source Files</Filter>
13+
<ClInclude Include="Include\GUI.h">
14+
<Filter>Header Files</Filter>
1215
</ClInclude>
13-
<ClInclude Include="Source\GUIBanner.h">
14-
<Filter>Source Files</Filter>
16+
<ClInclude Include="Include\GUIBanner.h">
17+
<Filter>Header Files</Filter>
1518
</ClInclude>
16-
<ClInclude Include="Source\GUIButton.h">
17-
<Filter>Source Files</Filter>
19+
<ClInclude Include="Include\GUIButton.h">
20+
<Filter>Header Files</Filter>
1821
</ClInclude>
19-
<ClInclude Include="Source\GUICheckbox.h">
20-
<Filter>Source Files</Filter>
22+
<ClInclude Include="Include\GUICheckbox.h">
23+
<Filter>Header Files</Filter>
2124
</ClInclude>
22-
<ClInclude Include="Source\GUICollectionBox.h">
23-
<Filter>Source Files</Filter>
25+
<ClInclude Include="Include\GUICollectionBox.h">
26+
<Filter>Header Files</Filter>
2427
</ClInclude>
25-
<ClInclude Include="Source\GUIComboBox.h">
26-
<Filter>Source Files</Filter>
28+
<ClInclude Include="Include\GUIComboBox.h">
29+
<Filter>Header Files</Filter>
2730
</ClInclude>
28-
<ClInclude Include="Source\GUIControl.h">
29-
<Filter>Source Files</Filter>
31+
<ClInclude Include="Include\GUIControl.h">
32+
<Filter>Header Files</Filter>
3033
</ClInclude>
31-
<ClInclude Include="Source\GUIControlFactory.h">
32-
<Filter>Source Files</Filter>
34+
<ClInclude Include="Include\GUIControlFactory.h">
35+
<Filter>Header Files</Filter>
3336
</ClInclude>
34-
<ClInclude Include="Source\GUIControlManager.h">
35-
<Filter>Source Files</Filter>
37+
<ClInclude Include="Include\GUIControlManager.h">
38+
<Filter>Header Files</Filter>
3639
</ClInclude>
37-
<ClInclude Include="Source\GUIEvent.h">
38-
<Filter>Source Files</Filter>
40+
<ClInclude Include="Include\GUIEvent.h">
41+
<Filter>Header Files</Filter>
3942
</ClInclude>
40-
<ClInclude Include="Source\GUIFont.h">
41-
<Filter>Source Files</Filter>
43+
<ClInclude Include="Include\GUIFont.h">
44+
<Filter>Header Files</Filter>
4245
</ClInclude>
43-
<ClInclude Include="Source\GUIInput.h">
44-
<Filter>Source Files</Filter>
46+
<ClInclude Include="Include\GUIInput.h">
47+
<Filter>Header Files</Filter>
4548
</ClInclude>
46-
<ClInclude Include="Source\GUILabel.h">
47-
<Filter>Source Files</Filter>
49+
<ClInclude Include="Include\GUIInterface.h">
50+
<Filter>Header Files</Filter>
4851
</ClInclude>
49-
<ClInclude Include="Source\GUIListBox.h">
50-
<Filter>Source Files</Filter>
52+
<ClInclude Include="Include\GUILabel.h">
53+
<Filter>Header Files</Filter>
5154
</ClInclude>
52-
<ClInclude Include="Source\GUIListPanel.h">
53-
<Filter>Source Files</Filter>
55+
<ClInclude Include="Include\GUIListBox.h">
56+
<Filter>Header Files</Filter>
5457
</ClInclude>
55-
<ClInclude Include="Source\GUIManager.h">
56-
<Filter>Source Files</Filter>
58+
<ClInclude Include="Include\GUIListPanel.h">
59+
<Filter>Header Files</Filter>
5760
</ClInclude>
58-
<ClInclude Include="Source\GUIPanel.h">
59-
<Filter>Source Files</Filter>
61+
<ClInclude Include="Include\GUIManager.h">
62+
<Filter>Header Files</Filter>
6063
</ClInclude>
61-
<ClInclude Include="Source\GUIProgressBar.h">
62-
<Filter>Source Files</Filter>
64+
<ClInclude Include="Include\GUIPanel.h">
65+
<Filter>Header Files</Filter>
6366
</ClInclude>
64-
<ClInclude Include="Source\GUIProperties.h">
65-
<Filter>Source Files</Filter>
67+
<ClInclude Include="Include\GUIProgressBar.h">
68+
<Filter>Header Files</Filter>
6669
</ClInclude>
67-
<ClInclude Include="Source\GUIPropertyPage.h">
68-
<Filter>Source Files</Filter>
70+
<ClInclude Include="Include\GUIProperties.h">
71+
<Filter>Header Files</Filter>
6972
</ClInclude>
70-
<ClInclude Include="Source\GUIRadioButton.h">
71-
<Filter>Source Files</Filter>
73+
<ClInclude Include="Include\GUIPropertyPage.h">
74+
<Filter>Header Files</Filter>
7275
</ClInclude>
73-
<ClInclude Include="Source\GUIScrollbar.h">
74-
<Filter>Source Files</Filter>
76+
<ClInclude Include="Include\GUIRadioButton.h">
77+
<Filter>Header Files</Filter>
7578
</ClInclude>
76-
<ClInclude Include="Source\GUIScrollPanel.h">
77-
<Filter>Source Files</Filter>
79+
<ClInclude Include="Include\GUIScrollbar.h">
80+
<Filter>Header Files</Filter>
7881
</ClInclude>
79-
<ClInclude Include="Source\GUISkin.h">
80-
<Filter>Source Files</Filter>
82+
<ClInclude Include="Include\GUIScrollPanel.h">
83+
<Filter>Header Files</Filter>
8184
</ClInclude>
82-
<ClInclude Include="Source\GUISlider.h">
83-
<Filter>Source Files</Filter>
85+
<ClInclude Include="Include\GUISkin.h">
86+
<Filter>Header Files</Filter>
8487
</ClInclude>
85-
<ClInclude Include="Source\GUITab.h">
86-
<Filter>Source Files</Filter>
88+
<ClInclude Include="Include\GUISlider.h">
89+
<Filter>Header Files</Filter>
8790
</ClInclude>
88-
<ClInclude Include="Source\GUITextBox.h">
89-
<Filter>Source Files</Filter>
91+
<ClInclude Include="Include\GUITab.h">
92+
<Filter>Header Files</Filter>
9093
</ClInclude>
91-
<ClInclude Include="Source\GUITextPanel.h">
92-
<Filter>Source Files</Filter>
94+
<ClInclude Include="Include\GUITextBox.h">
95+
<Filter>Header Files</Filter>
9396
</ClInclude>
94-
<ClInclude Include="Source\GUIUtil.h">
95-
<Filter>Source Files</Filter>
97+
<ClInclude Include="Include\GUITextPanel.h">
98+
<Filter>Header Files</Filter>
9699
</ClInclude>
97-
<ClInclude Include="Source\GUIInterface.h">
98-
<Filter>Source Files</Filter>
100+
<ClInclude Include="Include\GUIUtil.h">
101+
<Filter>Header Files</Filter>
99102
</ClInclude>
100103
<ClInclude Include="LibraryIncludes.h" />
101104
</ItemGroup>

‎GUILibrary/Source/GUI.h renamed to ‎GUILibrary/Include/GUI.h

File renamed without changes.

‎GUILibrary/Source/GUIBanner.h renamed to ‎GUILibrary/Include/GUIBanner.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ struct BITMAP;
1818

1919
#define MAXBANNERFONTCHARS 256
2020

21-
namespace RTE
21+
using namespace RTE;
22+
namespace GUI
2223
{
2324

2425

@@ -323,6 +324,6 @@ class GUIBanner {
323324
Timer m_FrameTimer;
324325
};
325326

326-
}; // namespace RTE
327+
}; // namespace GUI
327328

328329
#endif // _GUIBanner_

‎GUILibrary/Source/GUIButton.h renamed to ‎GUILibrary/Include/GUIButton.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// www.shplorb.com/~jackal
1212

1313

14-
namespace RTE
14+
namespace GUI
1515
{
1616

1717

@@ -267,7 +267,7 @@ class GUIButton :
267267
};
268268

269269

270-
}; // namespace RTE
270+
}; // namespace GUI
271271

272272

273273
#endif // _GUIBUTTON_

‎GUILibrary/Source/GUICheckbox.h renamed to ‎GUILibrary/Include/GUICheckbox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// www.shplorb.com/~jackal
1212

1313

14-
namespace RTE
14+
namespace GUI
1515
{
1616

1717

@@ -264,7 +264,7 @@ class GUICheckbox :
264264
};
265265

266266

267-
}; // namespace RTE
267+
}; // namespace GUI
268268

269269

270270
#endif // _GUICHECKBOX_

‎GUILibrary/Source/GUICollectionBox.h renamed to ‎GUILibrary/Include/GUICollectionBox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// www.shplorb.com/~jackal
1212

1313

14-
namespace RTE
14+
namespace GUI
1515
{
1616

1717

@@ -293,7 +293,7 @@ class GUICollectionBox :
293293
};
294294

295295

296-
}; // namespace RTE
296+
}; // namespace GUI
297297

298298

299299
#endif // _GUICOLLECTIONBOX_

‎GUILibrary/Source/GUIComboBox.h renamed to ‎GUILibrary/Include/GUIComboBox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "GUIListPanel.h"
1919

2020

21-
namespace RTE
21+
namespace GUI
2222
{
2323

2424

@@ -533,7 +533,7 @@ class GUIComboBoxButton :
533533
};
534534

535535

536-
}; // namespace RTE
536+
}; // namespace GUI
537537

538538

539539
#endif // _GUICOMBOBOX_

0 commit comments

Comments
 (0)