Skip to content

Commit d5e1587

Browse files
MaximDudeMaximDude
committed
Project settings changes
1 parent ca36bc2 commit d5e1587

File tree

4 files changed

+52
-46
lines changed

4 files changed

+52
-46
lines changed

‎GUIEditor.vcxproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6161
<ClCompile>
6262
<Optimization>Disabled</Optimization>
63-
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)System;$(ProjectDir)Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64-
<PreprocessorDefinitions>ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;_WINDOWS;WIN32;GUI_STANDALONE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
63+
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)System\Wrappers;$(ProjectDir)System;$(ProjectDir)Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<PreprocessorDefinitions>ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;GUI_STANDALONE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6565
<MinimalRebuild>false</MinimalRebuild>
6666
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6767
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -71,6 +71,8 @@
7171
<ForcedIncludeFiles>StandardIncludes.h;</ForcedIncludeFiles>
7272
<MultiProcessorCompilation>true</MultiProcessorCompilation>
7373
<PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
74+
<DisableSpecificWarnings>
75+
</DisableSpecificWarnings>
7476
</ClCompile>
7577
<Link>
7678
<AdditionalDependencies>dinput.lib;ddraw.lib;dxguid.lib;winmm.lib;allegro_static_debug.lib;dinput8.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -86,15 +88,17 @@
8688
</ItemDefinitionGroup>
8789
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8890
<ClCompile>
89-
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)System;$(ProjectDir)Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
90-
<PreprocessorDefinitions>ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;_WINDOWS;WIN32;GUI_STANDALONE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91+
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)System\Wrappers;$(ProjectDir)System;$(ProjectDir)Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
92+
<PreprocessorDefinitions>ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;GUI_STANDALONE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9193
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9294
<PrecompiledHeader>Use</PrecompiledHeader>
9395
<WarningLevel>Level2</WarningLevel>
9496
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
9597
<ForcedIncludeFiles>StandardIncludes.h;</ForcedIncludeFiles>
9698
<MultiProcessorCompilation>true</MultiProcessorCompilation>
9799
<PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
100+
<DisableSpecificWarnings>
101+
</DisableSpecificWarnings>
98102
</ClCompile>
99103
<Link>
100104
<AdditionalDependencies>dinput.lib;ddraw.lib;dxguid.lib;winmm.lib;allegro_static_release.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -125,6 +129,7 @@
125129
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
126130
</ClCompile>
127131
<ClCompile Include="System\Timer.cpp" />
132+
<ClCompile Include="System\Vector.cpp" />
128133
<ClCompile Include="System\Wrappers\AllegroBitmap.cpp" />
129134
<ClCompile Include="System\Wrappers\AllegroInput.cpp" />
130135
<ClCompile Include="System\Wrappers\AllegroScreen.cpp" />
@@ -140,8 +145,10 @@
140145
<ClInclude Include="System\ContentFile.h" />
141146
<ClInclude Include="System\Reader.h" />
142147
<ClInclude Include="System\RTEError.h" />
148+
<ClInclude Include="System\Serializable.h" />
143149
<ClInclude Include="System\StandardIncludes.h" />
144150
<ClInclude Include="System\Timer.h" />
151+
<ClInclude Include="System\Vector.h" />
145152
<ClInclude Include="System\Wrappers\AllegroBitmap.h" />
146153
<ClInclude Include="System\Wrappers\AllegroInput.h" />
147154
<ClInclude Include="System\Wrappers\AllegroScreen.h" />

‎GUIEditor.vcxproj.filters

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
<ClCompile Include="Managers\UInputMan.cpp">
4949
<Filter>Managers</Filter>
5050
</ClCompile>
51-
<ClCompile Include="System\RTEError.cpp">
52-
<Filter>System</Filter>
53-
</ClCompile>
5451
<ClCompile Include="System\StandardIncludes.cpp">
5552
<Filter>System</Filter>
5653
</ClCompile>
@@ -63,6 +60,12 @@
6360
<ClCompile Include="System\Wrappers\AllegroScreen.cpp">
6461
<Filter>System\Wrappers</Filter>
6562
</ClCompile>
63+
<ClCompile Include="System\Vector.cpp">
64+
<Filter>System</Filter>
65+
</ClCompile>
66+
<ClCompile Include="System\RTEError.cpp">
67+
<Filter>System</Filter>
68+
</ClCompile>
6669
</ItemGroup>
6770
<ItemGroup>
6871
<ClInclude Include="Resources\resource.h">
@@ -95,9 +98,6 @@
9598
<ClInclude Include="Managers\UInputMan.h">
9699
<Filter>Managers</Filter>
97100
</ClInclude>
98-
<ClInclude Include="System\RTEError.h">
99-
<Filter>System</Filter>
100-
</ClInclude>
101101
<ClInclude Include="System\StandardIncludes.h">
102102
<Filter>System</Filter>
103103
</ClInclude>
@@ -110,6 +110,15 @@
110110
<ClInclude Include="System\Wrappers\AllegroScreen.h">
111111
<Filter>System\Wrappers</Filter>
112112
</ClInclude>
113+
<ClInclude Include="System\Vector.h">
114+
<Filter>System</Filter>
115+
</ClInclude>
116+
<ClInclude Include="System\Serializable.h">
117+
<Filter>System</Filter>
118+
</ClInclude>
119+
<ClInclude Include="System\RTEError.h">
120+
<Filter>System</Filter>
121+
</ClInclude>
113122
</ItemGroup>
114123
<ItemGroup>
115124
<ResourceCompile Include="Resources\Resource.rc">

‎GUILibrary/GUILibrary.vcxproj

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@
7474
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7575
<LinkIncremental>true</LinkIncremental>
7676
<OutDir>$(SolutionDir)_Bin\</OutDir>
77-
<IntDir>_Bin\$(ProjectName)\$(Configuration)\</IntDir>
78-
<TargetName>RTE GUI Library.debug</TargetName>
77+
<IntDir>$(SolutionDir)_Bin\$(ProjectName)\$(Configuration)\</IntDir>
78+
<TargetName>RTEGUI.lib.debug</TargetName>
7979
</PropertyGroup>
8080
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8181
<LinkIncremental>true</LinkIncremental>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8484
<LinkIncremental>false</LinkIncremental>
8585
<OutDir>$(SolutionDir)_Bin\</OutDir>
86-
<IntDir>_Bin\$(ProjectName)\$(Configuration)\</IntDir>
87-
<TargetName>RTE GUI Library</TargetName>
86+
<IntDir>$(SolutionDir)_Bin\$(ProjectName)\$(Configuration)\</IntDir>
87+
<TargetName>RTEGUI.lib.release</TargetName>
8888
</PropertyGroup>
8989
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
9090
<LinkIncremental>false</LinkIncremental>
@@ -95,11 +95,14 @@
9595
<WarningLevel>Level3</WarningLevel>
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
98-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<ConformanceMode>true</ConformanceMode>
100-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
101-
<AdditionalIncludeDirectories>$(SolutionDir)external\include;$(SolutionDir)System;$(ProjectDir)Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102-
<ForcedIncludeFiles>StandardIncludes.h;</ForcedIncludeFiles>
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>
103+
<DisableSpecificWarnings>4996;4244;4018;4006;4305;</DisableSpecificWarnings>
104+
<CompileAs>CompileAsCpp</CompileAs>
105+
<CallingConvention>Cdecl</CallingConvention>
103106
</ClCompile>
104107
<Link>
105108
<SubSystem>Windows</SubSystem>
@@ -129,11 +132,16 @@
129132
<FunctionLevelLinking>true</FunctionLevelLinking>
130133
<IntrinsicFunctions>true</IntrinsicFunctions>
131134
<SDLCheck>true</SDLCheck>
132-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135+
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133136
<ConformanceMode>true</ConformanceMode>
134-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
135-
<AdditionalIncludeDirectories>$(SolutionDir)external\include;$(SolutionDir)System;$(ProjectDir)Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136-
<ForcedIncludeFiles>StandardIncludes.h;</ForcedIncludeFiles>
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>
140+
<DisableSpecificWarnings>4996;4244;4018;4006;4305;</DisableSpecificWarnings>
141+
<CompileAs>CompileAsCpp</CompileAs>
142+
<CallingConvention>Cdecl</CallingConvention>
143+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
144+
<OmitFramePointers>true</OmitFramePointers>
137145
</ClCompile>
138146
<Link>
139147
<SubSystem>Windows</SubSystem>
@@ -162,8 +170,7 @@
162170
</Link>
163171
</ItemDefinitionGroup>
164172
<ItemGroup>
165-
<ClInclude Include="framework.h" />
166-
<ClInclude Include="pch.h" />
173+
<ClInclude Include="LibraryIncludes.h" />
167174
<ClInclude Include="Source\GUI.h" />
168175
<ClInclude Include="Source\GUIBanner.h" />
169176
<ClInclude Include="Source\GUIButton.h" />
@@ -193,18 +200,15 @@
193200
<ClInclude Include="Source\GUITextBox.h" />
194201
<ClInclude Include="Source\GUITextPanel.h" />
195202
<ClInclude Include="Source\GUIUtil.h" />
196-
<ClInclude Include="Source\Interface.h" />
197-
<ClInclude Include="Source\WinUtil.h" />
203+
<ClInclude Include="Source\GUIInterface.h" />
198204
</ItemGroup>
199205
<ItemGroup>
200-
<ClCompile Include="GUILibrary.cpp" />
201-
<ClCompile Include="pch.cpp">
206+
<ClCompile Include="LibraryIncludes.cpp">
202207
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
203208
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
204209
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
205210
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
206211
</ClCompile>
207-
<ClCompile Include="Source\GUI.cpp" />
208212
<ClCompile Include="Source\GUIBanner.cpp" />
209213
<ClCompile Include="Source\GUIButton.cpp" />
210214
<ClCompile Include="Source\GUICheckbox.cpp" />
@@ -233,7 +237,6 @@
233237
<ClCompile Include="Source\GUITextBox.cpp" />
234238
<ClCompile Include="Source\GUITextPanel.cpp" />
235239
<ClCompile Include="Source\GUIUtil.cpp" />
236-
<ClCompile Include="Source\WinUtil.cpp" />
237240
</ItemGroup>
238241
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
239242
<ImportGroup Label="ExtensionTargets">

‎GUILibrary/GUILibrary.vcxproj.filters

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
</Filter>
88
</ItemGroup>
99
<ItemGroup>
10-
<ClInclude Include="framework.h" />
11-
<ClInclude Include="pch.h" />
1210
<ClInclude Include="Source\GUI.h">
1311
<Filter>Source Files</Filter>
1412
</ClInclude>
@@ -96,21 +94,12 @@
9694
<ClInclude Include="Source\GUIUtil.h">
9795
<Filter>Source Files</Filter>
9896
</ClInclude>
99-
<ClInclude Include="Source\Interface.h">
100-
<Filter>Source Files</Filter>
101-
</ClInclude>
102-
<ClInclude Include="Source\WinUtil.h">
97+
<ClInclude Include="Source\GUIInterface.h">
10398
<Filter>Source Files</Filter>
10499
</ClInclude>
100+
<ClInclude Include="LibraryIncludes.h" />
105101
</ItemGroup>
106102
<ItemGroup>
107-
<ClCompile Include="GUILibrary.cpp">
108-
<Filter>Source Files</Filter>
109-
</ClCompile>
110-
<ClCompile Include="pch.cpp" />
111-
<ClCompile Include="Source\GUI.cpp">
112-
<Filter>Source Files</Filter>
113-
</ClCompile>
114103
<ClCompile Include="Source\GUIBanner.cpp">
115104
<Filter>Source Files</Filter>
116105
</ClCompile>
@@ -195,8 +184,6 @@
195184
<ClCompile Include="Source\GUIUtil.cpp">
196185
<Filter>Source Files</Filter>
197186
</ClCompile>
198-
<ClCompile Include="Source\WinUtil.cpp">
199-
<Filter>Source Files</Filter>
200-
</ClCompile>
187+
<ClCompile Include="LibraryIncludes.cpp" />
201188
</ItemGroup>
202189
</Project>

0 commit comments

Comments
 (0)