Skip to content

Commit b267725

Browse files
MaximDudeMaximDude
committed
Project settings and file changes
1 parent 7d0a7fd commit b267725

File tree

5 files changed

+112
-17
lines changed

5 files changed

+112
-17
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
*.pch
88
*.exe
99
*.aps
10+
*.log
1011
*.vs
1112
*.vcxproj.user
1213

13-
_Bin
14+
_Bin
15+

‎GUIEditor.vcxproj

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6161
<ClCompile>
6262
<Optimization>Disabled</Optimization>
63-
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)System\Wrappers;$(ProjectDir)System;$(ProjectDir)Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
63+
<AdditionalIncludeDirectories>$(SolutionDir)GUILibrary;$(ProjectDir)GUILibrary\Include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)external\include;..\Cortex-Command-Community-Project-Source\Menus;..\Cortex-Command-Community-Project-Source\Entities;..\Cortex-Command-Community-Project-Source\System;..\Cortex-Command-Community-Project-Source\GUI;..\Cortex-Command-Community-Project-Source\Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6464
<PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;GUI_STANDALONE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6565
<MinimalRebuild>false</MinimalRebuild>
6666
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -70,46 +70,51 @@
7070
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
7171
<ForcedIncludeFiles>LibraryIncludes.h;</ForcedIncludeFiles>
7272
<MultiProcessorCompilation>true</MultiProcessorCompilation>
73-
<DisableSpecificWarnings>
74-
</DisableSpecificWarnings>
7573
<PrecompiledHeaderFile>LibraryIncludes.h</PrecompiledHeaderFile>
74+
<DisableSpecificWarnings>4005;</DisableSpecificWarnings>
75+
<IntrinsicFunctions>false</IntrinsicFunctions>
76+
<OmitFramePointers>false</OmitFramePointers>
77+
<ConformanceMode>true</ConformanceMode>
7678
</ClCompile>
7779
<Link>
78-
<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>
79-
<AdditionalLibraryDirectories>..\..\System\fmod\lib;..\..\System\DirectX\lib;..\..\System\Allegro\lib;..\..\external/lib/win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
80+
<AdditionalDependencies>dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;dsound.lib;winmm.lib;allegro_static_debug.lib;RTEGUI.lib.debug.lib;dinput8.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
81+
<AdditionalLibraryDirectories>$(SolutionDir)_Bin;$(ProjectDir)external\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
8082
<GenerateDebugInformation>true</GenerateDebugInformation>
8183
<SubSystem>Windows</SubSystem>
8284
<TargetMachine>MachineX86</TargetMachine>
8385
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
86+
<AdditionalOptions>/ignore:4099 /ignore:4217 /ignore:4049 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
8487
</Link>
8588
<Manifest>
8689
<OutputManifestFile>$(IntDir)$(Configuration).manifest</OutputManifestFile>
8790
</Manifest>
8891
</ItemDefinitionGroup>
8992
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9093
<ClCompile>
91-
<AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)System\Wrappers;$(ProjectDir)System;$(ProjectDir)Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
94+
<AdditionalIncludeDirectories>$(SolutionDir)GUILibrary;$(ProjectDir)GUILibrary\Include;$(ProjectDir)GUILibrary\Source;$(ProjectDir)external\include;..\Cortex-Command-Community-Project-Source\Menus;..\Cortex-Command-Community-Project-Source\Entities;..\Cortex-Command-Community-Project-Source\System;..\Cortex-Command-Community-Project-Source\GUI;..\Cortex-Command-Community-Project-Source\Managers;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9295
<PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;GUI_STANDALONE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9396
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9497
<PrecompiledHeader>Use</PrecompiledHeader>
9598
<WarningLevel>Level2</WarningLevel>
9699
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
97100
<ForcedIncludeFiles>LibraryIncludes.h;</ForcedIncludeFiles>
98101
<MultiProcessorCompilation>true</MultiProcessorCompilation>
99-
<DisableSpecificWarnings>
100-
</DisableSpecificWarnings>
101102
<PrecompiledHeaderFile>LibraryIncludes.h</PrecompiledHeaderFile>
103+
<DisableSpecificWarnings>4005;</DisableSpecificWarnings>
104+
<IntrinsicFunctions>true</IntrinsicFunctions>
105+
<OmitFramePointers>true</OmitFramePointers>
106+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
102107
</ClCompile>
103108
<Link>
104-
<AdditionalDependencies>dinput.lib;ddraw.lib;dxguid.lib;winmm.lib;allegro_static_release.lib;%(AdditionalDependencies)</AdditionalDependencies>
105-
<OutputFile>$(OutDir)GUIEditor.exe</OutputFile>
106-
<AdditionalLibraryDirectories>..\..\System\fmod\lib;..\..\System\DirectX\lib;..\..\external\lib\win\;..\..\external/lib/win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
107-
<GenerateDebugInformation>true</GenerateDebugInformation>
109+
<AdditionalDependencies>dinput.lib;dinput8.lib;ddraw.lib;dxguid.lib;dsound.lib;winmm.lib;allegro_static_release.lib;RTEGUI.lib.release.lib;%(AdditionalDependencies)</AdditionalDependencies>
108110
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
111+
<AdditionalLibraryDirectories>$(SolutionDir)_Bin;$(ProjectDir)external\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
112+
<GenerateDebugInformation>false</GenerateDebugInformation>
109113
<SubSystem>Windows</SubSystem>
110114
<OptimizeReferences>true</OptimizeReferences>
111115
<EnableCOMDATFolding>true</EnableCOMDATFolding>
112116
<TargetMachine>MachineX86</TargetMachine>
117+
<AdditionalOptions>/ignore:4099 /ignore:4217 /ignore:4049 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
113118
</Link>
114119
<Manifest>
115120
<OutputManifestFile>$(IntDir)$(Configuration).manifest</OutputManifestFile>
@@ -123,12 +128,18 @@
123128
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
124129
</ClCompile>
125130
<ClCompile Include="Main.cpp" />
131+
<ClCompile Include="Wrappers\AllegroBitmap.cpp" />
132+
<ClCompile Include="Wrappers\AllegroInput.cpp" />
133+
<ClCompile Include="Wrappers\AllegroScreen.cpp" />
126134
</ItemGroup>
127135
<ItemGroup>
128136
<ClInclude Include="Editor\GUIEditorApp.h" />
129137
<ClInclude Include="Editor\GUIEditorLib.h" />
130138
<ClInclude Include="GUILibrary\LibraryIncludes.h" />
131139
<ClInclude Include="Resources\resource.h" />
140+
<ClInclude Include="Wrappers\AllegroBitmap.h" />
141+
<ClInclude Include="Wrappers\AllegroInput.h" />
142+
<ClInclude Include="Wrappers\AllegroScreen.h" />
132143
</ItemGroup>
133144
<ItemGroup>
134145
<ResourceCompile Include="Resources\Resource.rc" />

‎GUIEditor.vcxproj.filters

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
1010
<Extensions>c;cpp;h;hpp</Extensions>
1111
</Filter>
12+
<Filter Include="Wrappers">
13+
<UniqueIdentifier>{19f78555-2348-4d33-be7f-74aaade17d63}</UniqueIdentifier>
14+
</Filter>
1215
</ItemGroup>
1316
<ItemGroup>
1417
<ClCompile Include="Main.cpp" />
@@ -19,6 +22,15 @@
1922
<Filter>Editor</Filter>
2023
</ClCompile>
2124
<ClCompile Include="GUILibrary\LibraryIncludes.cpp" />
25+
<ClCompile Include="Wrappers\AllegroBitmap.cpp">
26+
<Filter>Wrappers</Filter>
27+
</ClCompile>
28+
<ClCompile Include="Wrappers\AllegroInput.cpp">
29+
<Filter>Wrappers</Filter>
30+
</ClCompile>
31+
<ClCompile Include="Wrappers\AllegroScreen.cpp">
32+
<Filter>Wrappers</Filter>
33+
</ClCompile>
2234
</ItemGroup>
2335
<ItemGroup>
2436
<ClInclude Include="Resources\resource.h">
@@ -31,6 +43,15 @@
3143
<Filter>Editor</Filter>
3244
</ClInclude>
3345
<ClInclude Include="GUILibrary\LibraryIncludes.h" />
46+
<ClInclude Include="Wrappers\AllegroBitmap.h">
47+
<Filter>Wrappers</Filter>
48+
</ClInclude>
49+
<ClInclude Include="Wrappers\AllegroInput.h">
50+
<Filter>Wrappers</Filter>
51+
</ClInclude>
52+
<ClInclude Include="Wrappers\AllegroScreen.h">
53+
<Filter>Wrappers</Filter>
54+
</ClInclude>
3455
</ItemGroup>
3556
<ItemGroup>
3657
<ResourceCompile Include="Resources\Resource.rc">

‎GUILibrary/GUILibrary.vcxproj

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,17 @@
9595
<WarningLevel>Level1</WarningLevel>
9696
<Optimization>Disabled</Optimization>
9797
<SDLCheck>true</SDLCheck>
98-
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;GUI_STANDALONE;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<ConformanceMode>true</ConformanceMode>
100100
<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>
101+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\include;$(SolutionDir)Wrappers;$(ProjectDir)Include;$(ProjectDir)Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102102
<ForcedIncludeFiles>$(ProjectDir)LibraryIncludes.h;</ForcedIncludeFiles>
103103
<DisableSpecificWarnings>4996;4244;4018;4006;4305;</DisableSpecificWarnings>
104104
<CompileAs>CompileAsCpp</CompileAs>
105105
<CallingConvention>Cdecl</CallingConvention>
106106
<OmitDefaultLibName>true</OmitDefaultLibName>
107107
<LanguageStandard>stdcpp14</LanguageStandard>
108+
<FloatingPointModel>Fast</FloatingPointModel>
108109
</ClCompile>
109110
<Link>
110111
<SubSystem>Windows</SubSystem>
@@ -134,10 +135,10 @@
134135
<FunctionLevelLinking>true</FunctionLevelLinking>
135136
<IntrinsicFunctions>true</IntrinsicFunctions>
136137
<SDLCheck>true</SDLCheck>
137-
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
138+
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;GUI_STANDALONE;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
138139
<ConformanceMode>true</ConformanceMode>
139140
<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+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)external\include;$(SolutionDir)Wrappers;$(ProjectDir)Include;$(ProjectDir)Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
141142
<ForcedIncludeFiles>$(ProjectDir)LibraryIncludes.h;</ForcedIncludeFiles>
142143
<DisableSpecificWarnings>4996;4244;4018;4006;4305;</DisableSpecificWarnings>
143144
<CompileAs>CompileAsCpp</CompileAs>
@@ -146,6 +147,7 @@
146147
<OmitFramePointers>true</OmitFramePointers>
147148
<OmitDefaultLibName>true</OmitDefaultLibName>
148149
<LanguageStandard>stdcpp14</LanguageStandard>
150+
<FloatingPointModel>Fast</FloatingPointModel>
149151
</ClCompile>
150152
<Link>
151153
<SubSystem>Windows</SubSystem>
@@ -174,6 +176,13 @@
174176
</Link>
175177
</ItemDefinitionGroup>
176178
<ItemGroup>
179+
<ClInclude Include="..\Wrappers\ContentFile.h" />
180+
<ClInclude Include="..\Wrappers\Reader.h" />
181+
<ClInclude Include="..\Wrappers\RTEError.h" />
182+
<ClInclude Include="..\Wrappers\Timer.h" />
183+
<ClInclude Include="..\Wrappers\TimerMan.h" />
184+
<ClInclude Include="..\Wrappers\Vector.h" />
185+
<ClInclude Include="..\Wrappers\Writer.h" />
177186
<ClInclude Include="Include\GUI.h" />
178187
<ClInclude Include="Include\GUIBanner.h" />
179188
<ClInclude Include="Include\GUIButton.h" />
@@ -207,6 +216,13 @@
207216
<ClInclude Include="LibraryIncludes.h" />
208217
</ItemGroup>
209218
<ItemGroup>
219+
<ClCompile Include="..\Wrappers\ContentFile.cpp" />
220+
<ClCompile Include="..\Wrappers\Reader.cpp" />
221+
<ClCompile Include="..\Wrappers\RTEError.cpp" />
222+
<ClCompile Include="..\Wrappers\Timer.cpp" />
223+
<ClCompile Include="..\Wrappers\TimerMan.cpp" />
224+
<ClCompile Include="..\Wrappers\Vector.cpp" />
225+
<ClCompile Include="..\Wrappers\Writer.cpp" />
210226
<ClCompile Include="LibraryIncludes.cpp">
211227
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
212228
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

‎GUILibrary/GUILibrary.vcxproj.filters

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<Filter Include="Header Files">
99
<UniqueIdentifier>{3b9d188e-4bbc-4d3a-8927-dbcd0dff8ccf}</UniqueIdentifier>
1010
</Filter>
11+
<Filter Include="Wrappers">
12+
<UniqueIdentifier>{c6a55314-6242-4c25-92ff-7d1508cadb9e}</UniqueIdentifier>
13+
</Filter>
1114
</ItemGroup>
1215
<ItemGroup>
1316
<ClInclude Include="Include\GUI.h">
@@ -101,6 +104,27 @@
101104
<Filter>Header Files</Filter>
102105
</ClInclude>
103106
<ClInclude Include="LibraryIncludes.h" />
107+
<ClInclude Include="..\Wrappers\ContentFile.h">
108+
<Filter>Wrappers</Filter>
109+
</ClInclude>
110+
<ClInclude Include="..\Wrappers\Reader.h">
111+
<Filter>Wrappers</Filter>
112+
</ClInclude>
113+
<ClInclude Include="..\Wrappers\RTEError.h">
114+
<Filter>Wrappers</Filter>
115+
</ClInclude>
116+
<ClInclude Include="..\Wrappers\Timer.h">
117+
<Filter>Wrappers</Filter>
118+
</ClInclude>
119+
<ClInclude Include="..\Wrappers\TimerMan.h">
120+
<Filter>Wrappers</Filter>
121+
</ClInclude>
122+
<ClInclude Include="..\Wrappers\Writer.h">
123+
<Filter>Wrappers</Filter>
124+
</ClInclude>
125+
<ClInclude Include="..\Wrappers\Vector.h">
126+
<Filter>Wrappers</Filter>
127+
</ClInclude>
104128
</ItemGroup>
105129
<ItemGroup>
106130
<ClCompile Include="Source\GUIBanner.cpp">
@@ -188,5 +212,26 @@
188212
<Filter>Source Files</Filter>
189213
</ClCompile>
190214
<ClCompile Include="LibraryIncludes.cpp" />
215+
<ClCompile Include="..\Wrappers\ContentFile.cpp">
216+
<Filter>Wrappers</Filter>
217+
</ClCompile>
218+
<ClCompile Include="..\Wrappers\Reader.cpp">
219+
<Filter>Wrappers</Filter>
220+
</ClCompile>
221+
<ClCompile Include="..\Wrappers\RTEError.cpp">
222+
<Filter>Wrappers</Filter>
223+
</ClCompile>
224+
<ClCompile Include="..\Wrappers\Timer.cpp">
225+
<Filter>Wrappers</Filter>
226+
</ClCompile>
227+
<ClCompile Include="..\Wrappers\TimerMan.cpp">
228+
<Filter>Wrappers</Filter>
229+
</ClCompile>
230+
<ClCompile Include="..\Wrappers\Writer.cpp">
231+
<Filter>Wrappers</Filter>
232+
</ClCompile>
233+
<ClCompile Include="..\Wrappers\Vector.cpp">
234+
<Filter>Wrappers</Filter>
235+
</ClCompile>
191236
</ItemGroup>
192237
</Project>

0 commit comments

Comments
 (0)