Skip to content

Commit 30969d7

Browse files
MaximDudeMaximDude
committed
Updating project settings
1 parent 4b7332c commit 30969d7

File tree

5 files changed

+402
-92
lines changed

5 files changed

+402
-92
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@
99
*.aps
1010
*.vs
1111
*.vcxproj.user
12+
13+
_Bin

‎GUIEditor.vcxproj

Lines changed: 63 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2222
<ConfigurationType>Application</ConfigurationType>
2323
<PlatformToolset>v141</PlatformToolset>
24-
<CharacterSet>Unicode</CharacterSet>
24+
<CharacterSet>MultiByte</CharacterSet>
2525
<WholeProgramOptimization>true</WholeProgramOptimization>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<PlatformToolset>v141</PlatformToolset>
30-
<CharacterSet>Unicode</CharacterSet>
30+
<CharacterSet>MultiByte</CharacterSet>
3131
</PropertyGroup>
3232
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3333
<ImportGroup Label="ExtensionSettings">
@@ -43,50 +43,61 @@
4343
<_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
46-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
47-
<IntDir>$(Configuration)\</IntDir>
46+
<OutDir>$(SolutionDir)_Bin\</OutDir>
47+
<IntDir>_Bin\$(ProjectName)\$(Configuration)\</IntDir>
4848
<LinkIncremental>true</LinkIncremental>
4949
<GenerateManifest>true</GenerateManifest>
50+
<TargetName>RTE GUI Editor.debug</TargetName>
51+
<EmbedManifest>false</EmbedManifest>
5052
</PropertyGroup>
5153
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
52-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
53-
<IntDir>$(Configuration)\</IntDir>
54+
<OutDir>$(SolutionDir)_Bin\</OutDir>
55+
<IntDir>_Bin\$(ProjectName)\$(Configuration)\</IntDir>
5456
<LinkIncremental>false</LinkIncremental>
57+
<TargetName>RTE GUI Editor</TargetName>
58+
<EmbedManifest>false</EmbedManifest>
5559
</PropertyGroup>
5660
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5761
<ClCompile>
5862
<Optimization>Disabled</Optimization>
59-
<AdditionalIncludeDirectories>..\..\;..\..\System\Allegro\include;../;Wrappers;..\..\external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
60-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ALLEGRO_STATICLINK;GUI_STANDALONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
61-
<MinimalRebuild>true</MinimalRebuild>
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>
65+
<MinimalRebuild>false</MinimalRebuild>
6266
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6367
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
64-
<PrecompiledHeader />
65-
<WarningLevel>Level3</WarningLevel>
68+
<PrecompiledHeader>Use</PrecompiledHeader>
69+
<WarningLevel>Level1</WarningLevel>
6670
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
67-
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
71+
<ForcedIncludeFiles>StandardIncludes.h;</ForcedIncludeFiles>
72+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
73+
<PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
6874
</ClCompile>
6975
<Link>
70-
<AdditionalDependencies>fmodvc.lib;dinput.lib;ddraw.lib;dxguid.lib;winmm.lib;dsound.lib;alld_s_c.lib;dinput8.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
76+
<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>
7177
<AdditionalLibraryDirectories>..\..\System\fmod\lib;..\..\System\DirectX\lib;..\..\System\Allegro\lib;..\..\external/lib/win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
7278
<GenerateDebugInformation>true</GenerateDebugInformation>
7379
<SubSystem>Windows</SubSystem>
7480
<TargetMachine>MachineX86</TargetMachine>
7581
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
7682
</Link>
83+
<Manifest>
84+
<OutputManifestFile>$(IntDir)$(Configuration).manifest</OutputManifestFile>
85+
</Manifest>
7786
</ItemDefinitionGroup>
7887
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7988
<ClCompile>
80-
<AdditionalIncludeDirectories>..\..\;..\..\external\include;..\;Wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
81-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ALLEGRO_STATICLINK;GUI_STANDALONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
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>
8291
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
83-
<PrecompiledHeader />
92+
<PrecompiledHeader>Use</PrecompiledHeader>
8493
<WarningLevel>Level2</WarningLevel>
8594
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
86-
<ForcedIncludeFiles>TargetSxS.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
95+
<ForcedIncludeFiles>StandardIncludes.h;</ForcedIncludeFiles>
96+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
97+
<PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
8798
</ClCompile>
8899
<Link>
89-
<AdditionalDependencies>fmodvc.lib;dinput.lib;ddraw.lib;dxguid.lib;winmm.lib;dsound.lib;alleg_s.lib;%(AdditionalDependencies)</AdditionalDependencies>
100+
<AdditionalDependencies>dinput.lib;ddraw.lib;dxguid.lib;winmm.lib;allegro_static_release.lib;%(AdditionalDependencies)</AdditionalDependencies>
90101
<OutputFile>$(OutDir)GUIEditor.exe</OutputFile>
91102
<AdditionalLibraryDirectories>..\..\System\fmod\lib;..\..\System\DirectX\lib;..\..\external\lib\win\;..\..\external/lib/win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
92103
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -95,29 +106,46 @@
95106
<EnableCOMDATFolding>true</EnableCOMDATFolding>
96107
<TargetMachine>MachineX86</TargetMachine>
97108
</Link>
109+
<Manifest>
110+
<OutputManifestFile>$(IntDir)$(Configuration).manifest</OutputManifestFile>
111+
</Manifest>
98112
</ItemDefinitionGroup>
99113
<ItemGroup>
114+
<ClCompile Include="Editor\GUIEditorApp.cpp" />
115+
<ClCompile Include="Editor\GUIEditorLib.cpp" />
100116
<ClCompile Include="Main.cpp" />
101-
<ClCompile Include="GUIEditorApp.cpp" />
102-
<ClCompile Include="GUIEditorLib.cpp" />
103-
<ClCompile Include="wrappers\ContentFile.cpp" />
104-
<ClCompile Include="wrappers\DDTError.cpp" />
105-
<ClCompile Include="wrappers\Reader.cpp" />
106-
<ClCompile Include="wrappers\Timer.cpp" />
107-
<ClCompile Include="wrappers\TimerMan.cpp" />
108-
<ClCompile Include="wrappers\Writer.cpp" />
117+
<ClCompile Include="Managers\FrameMan.cpp" />
118+
<ClCompile Include="Managers\TimerMan.cpp" />
119+
<ClCompile Include="Managers\UInputMan.cpp" />
120+
<ClCompile Include="System\ContentFile.cpp" />
121+
<ClCompile Include="System\Reader.cpp" />
122+
<ClCompile Include="System\RTEError.cpp" />
123+
<ClCompile Include="System\StandardIncludes.cpp">
124+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
125+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
126+
</ClCompile>
127+
<ClCompile Include="System\Timer.cpp" />
128+
<ClCompile Include="System\Wrappers\AllegroBitmap.cpp" />
129+
<ClCompile Include="System\Wrappers\AllegroInput.cpp" />
130+
<ClCompile Include="System\Wrappers\AllegroScreen.cpp" />
131+
<ClCompile Include="System\Writer.cpp" />
109132
</ItemGroup>
110133
<ItemGroup>
111-
<ClInclude Include="GUIEditorApp.h" />
112-
<ClInclude Include="GUIEditorLib.h" />
134+
<ClInclude Include="Editor\GUIEditorApp.h" />
135+
<ClInclude Include="Editor\GUIEditorLib.h" />
136+
<ClInclude Include="Managers\FrameMan.h" />
137+
<ClInclude Include="Managers\TimerMan.h" />
138+
<ClInclude Include="Managers\UInputMan.h" />
113139
<ClInclude Include="Resources\resource.h" />
114-
<ClInclude Include="wrappers\ContentFile.h" />
115-
<ClInclude Include="wrappers\DDTError.h" />
116-
<ClInclude Include="wrappers\FrameMan.h" />
117-
<ClInclude Include="wrappers\Reader.h" />
118-
<ClInclude Include="wrappers\Timer.h" />
119-
<ClInclude Include="wrappers\TimerMan.h" />
120-
<ClInclude Include="wrappers\Writer.h" />
140+
<ClInclude Include="System\ContentFile.h" />
141+
<ClInclude Include="System\Reader.h" />
142+
<ClInclude Include="System\RTEError.h" />
143+
<ClInclude Include="System\StandardIncludes.h" />
144+
<ClInclude Include="System\Timer.h" />
145+
<ClInclude Include="System\Wrappers\AllegroBitmap.h" />
146+
<ClInclude Include="System\Wrappers\AllegroInput.h" />
147+
<ClInclude Include="System\Wrappers\AllegroScreen.h" />
148+
<ClInclude Include="System\Writer.h" />
121149
</ItemGroup>
122150
<ItemGroup>
123151
<ResourceCompile Include="Resources\Resource.rc" />

‎GUIEditor.vcxproj.filters

Lines changed: 80 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,114 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Filter Include="Editor Files">
5-
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6-
<Extensions>c;cpp;h;hpp</Extensions>
7-
</Filter>
84
<Filter Include="Resource Files">
95
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
106
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
117
</Filter>
12-
<Filter Include="Wrappers">
13-
<UniqueIdentifier>{323d5ac6-d2a4-48b2-887b-9404379ef3fc}</UniqueIdentifier>
14-
</Filter>
158
<Filter Include="Managers">
169
<UniqueIdentifier>{75d4ffee-5b81-4250-a542-af4a50ca4d66}</UniqueIdentifier>
1710
</Filter>
11+
<Filter Include="Editor">
12+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
13+
<Extensions>c;cpp;h;hpp</Extensions>
14+
</Filter>
15+
<Filter Include="System">
16+
<UniqueIdentifier>{323d5ac6-d2a4-48b2-887b-9404379ef3fc}</UniqueIdentifier>
17+
</Filter>
18+
<Filter Include="System\Wrappers">
19+
<UniqueIdentifier>{2ef3459b-5f1b-424c-8eec-b7bcbb440d70}</UniqueIdentifier>
20+
</Filter>
1821
</ItemGroup>
1922
<ItemGroup>
20-
<ClCompile Include="GUIEditorApp.cpp">
21-
<Filter>Editor Files</Filter>
23+
<ClCompile Include="Main.cpp" />
24+
<ClCompile Include="Editor\GUIEditorApp.cpp">
25+
<Filter>Editor</Filter>
2226
</ClCompile>
23-
<ClCompile Include="GUIEditorLib.cpp">
24-
<Filter>Editor Files</Filter>
27+
<ClCompile Include="Editor\GUIEditorLib.cpp">
28+
<Filter>Editor</Filter>
2529
</ClCompile>
26-
<ClCompile Include="wrappers\ContentFile.cpp">
27-
<Filter>Wrappers</Filter>
30+
<ClCompile Include="System\ContentFile.cpp">
31+
<Filter>System</Filter>
2832
</ClCompile>
29-
<ClCompile Include="wrappers\DDTError.cpp">
30-
<Filter>Wrappers</Filter>
33+
<ClCompile Include="System\Reader.cpp">
34+
<Filter>System</Filter>
3135
</ClCompile>
32-
<ClCompile Include="wrappers\Reader.cpp">
33-
<Filter>Wrappers</Filter>
36+
<ClCompile Include="System\Timer.cpp">
37+
<Filter>System</Filter>
3438
</ClCompile>
35-
<ClCompile Include="wrappers\Timer.cpp">
36-
<Filter>Wrappers</Filter>
39+
<ClCompile Include="System\Writer.cpp">
40+
<Filter>System</Filter>
3741
</ClCompile>
38-
<ClCompile Include="wrappers\TimerMan.cpp">
39-
<Filter>Wrappers</Filter>
42+
<ClCompile Include="Managers\FrameMan.cpp">
43+
<Filter>Managers</Filter>
4044
</ClCompile>
41-
<ClCompile Include="wrappers\Writer.cpp">
42-
<Filter>Wrappers</Filter>
45+
<ClCompile Include="Managers\TimerMan.cpp">
46+
<Filter>Managers</Filter>
47+
</ClCompile>
48+
<ClCompile Include="Managers\UInputMan.cpp">
49+
<Filter>Managers</Filter>
50+
</ClCompile>
51+
<ClCompile Include="System\RTEError.cpp">
52+
<Filter>System</Filter>
53+
</ClCompile>
54+
<ClCompile Include="System\StandardIncludes.cpp">
55+
<Filter>System</Filter>
56+
</ClCompile>
57+
<ClCompile Include="System\Wrappers\AllegroBitmap.cpp">
58+
<Filter>System\Wrappers</Filter>
59+
</ClCompile>
60+
<ClCompile Include="System\Wrappers\AllegroInput.cpp">
61+
<Filter>System\Wrappers</Filter>
62+
</ClCompile>
63+
<ClCompile Include="System\Wrappers\AllegroScreen.cpp">
64+
<Filter>System\Wrappers</Filter>
4365
</ClCompile>
44-
<ClCompile Include="Main.cpp" />
4566
</ItemGroup>
4667
<ItemGroup>
47-
<ClInclude Include="GUIEditorApp.h">
48-
<Filter>Editor Files</Filter>
68+
<ClInclude Include="Resources\resource.h">
69+
<Filter>Resource Files</Filter>
4970
</ClInclude>
50-
<ClInclude Include="GUIEditorLib.h">
51-
<Filter>Editor Files</Filter>
71+
<ClInclude Include="Editor\GUIEditorApp.h">
72+
<Filter>Editor</Filter>
5273
</ClInclude>
53-
<ClInclude Include="wrappers\ContentFile.h">
54-
<Filter>Wrappers</Filter>
74+
<ClInclude Include="Editor\GUIEditorLib.h">
75+
<Filter>Editor</Filter>
5576
</ClInclude>
56-
<ClInclude Include="wrappers\DDTError.h">
57-
<Filter>Wrappers</Filter>
77+
<ClInclude Include="System\ContentFile.h">
78+
<Filter>System</Filter>
5879
</ClInclude>
59-
<ClInclude Include="wrappers\FrameMan.h">
60-
<Filter>Wrappers</Filter>
80+
<ClInclude Include="System\Reader.h">
81+
<Filter>System</Filter>
6182
</ClInclude>
62-
<ClInclude Include="wrappers\Reader.h">
63-
<Filter>Wrappers</Filter>
83+
<ClInclude Include="System\Timer.h">
84+
<Filter>System</Filter>
6485
</ClInclude>
65-
<ClInclude Include="wrappers\Timer.h">
66-
<Filter>Wrappers</Filter>
86+
<ClInclude Include="System\Writer.h">
87+
<Filter>System</Filter>
6788
</ClInclude>
68-
<ClInclude Include="wrappers\TimerMan.h">
69-
<Filter>Wrappers</Filter>
89+
<ClInclude Include="Managers\FrameMan.h">
90+
<Filter>Managers</Filter>
7091
</ClInclude>
71-
<ClInclude Include="wrappers\Writer.h">
72-
<Filter>Wrappers</Filter>
92+
<ClInclude Include="Managers\TimerMan.h">
93+
<Filter>Managers</Filter>
7394
</ClInclude>
74-
<ClInclude Include="Resources\resource.h">
75-
<Filter>Resource Files</Filter>
95+
<ClInclude Include="Managers\UInputMan.h">
96+
<Filter>Managers</Filter>
97+
</ClInclude>
98+
<ClInclude Include="System\RTEError.h">
99+
<Filter>System</Filter>
100+
</ClInclude>
101+
<ClInclude Include="System\StandardIncludes.h">
102+
<Filter>System</Filter>
103+
</ClInclude>
104+
<ClInclude Include="System\Wrappers\AllegroBitmap.h">
105+
<Filter>System\Wrappers</Filter>
106+
</ClInclude>
107+
<ClInclude Include="System\Wrappers\AllegroInput.h">
108+
<Filter>System\Wrappers</Filter>
109+
</ClInclude>
110+
<ClInclude Include="System\Wrappers\AllegroScreen.h">
111+
<Filter>System\Wrappers</Filter>
76112
</ClInclude>
77113
</ItemGroup>
78114
<ItemGroup>

0 commit comments

Comments
 (0)