Skip to content

Commit 893370d

Browse files
committed
Moving flx file building into their own msvc project and adjusting msvc project dependencies
1 parent b4b666a commit 893370d

File tree

7 files changed

+337
-129
lines changed

7 files changed

+337
-129
lines changed

README.win32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Visual Studio 2017 does NOT work. It will load the projects but v141 build
204204
tools do not support all the C++/17 features needed by the exult source code. You
205205
can not sucessfully build all source files with VS 2017 v141 build tools.
206206

207-
Projects are included for Exult, expack, exconfig and Exult_studio,
207+
Projects are included for Exult, expack, exconfig, data flexes and Exult_studio,
208208
no projects are supplied for other tools. VCPKG is used for package management
209209
and you must have it installed and integrated into visual studio. The build
210210
process will automatically download and build needed dependencies. This will be

msvcstuff/vs2019/.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/packages
2-
Debug*
3-
*.user
2+
Debug
3+
**.user
4+
**.log
45
/any
5-
Release*
6+
Release
67
Nuget
78
vcpkg_installed

msvcstuff/vs2019/Exult.sln

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,22 @@ VisualStudioVersion = 17.4.32804.182
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Exult", "Exult.vcxproj", "{A5813648-2268-48AF-8D04-36CF6F0A73AF}"
77
ProjectSection(ProjectDependencies) = postProject
8-
{7D388E0F-AA32-459F-83FD-037299591DD6} = {7D388E0F-AA32-459F-83FD-037299591DD6}
8+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65} = {68AA7C73-DF57-4B90-84F1-189EB30C3A65}
99
EndProjectSection
1010
EndProject
1111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expack", "expack\expack.vcxproj", "{7D388E0F-AA32-459F-83FD-037299591DD6}"
1212
EndProject
1313
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exconfig", "exconfig\exconfig.vcxproj", "{567827FF-4807-417D-BFEC-1778E0FCC24B}"
1414
EndProject
1515
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exult_studio", "exult_studio\exult_studio.vcxproj", "{53599A90-51EC-406E-A303-42C3B7BF2161}"
16+
ProjectSection(ProjectDependencies) = postProject
17+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65} = {68AA7C73-DF57-4B90-84F1-189EB30C3A65}
18+
EndProjectSection
19+
EndProject
20+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data/flexes", "data\data.vcxproj", "{68AA7C73-DF57-4B90-84F1-189EB30C3A65}"
21+
ProjectSection(ProjectDependencies) = postProject
22+
{7D388E0F-AA32-459F-83FD-037299591DD6} = {7D388E0F-AA32-459F-83FD-037299591DD6}
23+
EndProjectSection
1624
EndProject
1725
Global
1826
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,6 +60,14 @@ Global
5260
{53599A90-51EC-406E-A303-42C3B7BF2161}.Release|x64.Build.0 = Release|x64
5361
{53599A90-51EC-406E-A303-42C3B7BF2161}.Release|x86.ActiveCfg = Release|Win32
5462
{53599A90-51EC-406E-A303-42C3B7BF2161}.Release|x86.Build.0 = Release|Win32
63+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Debug|x64.ActiveCfg = Debug|x64
64+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Debug|x64.Build.0 = Debug|x64
65+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Debug|x86.ActiveCfg = Debug|Win32
66+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Debug|x86.Build.0 = Debug|Win32
67+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Release|x64.ActiveCfg = Release|x64
68+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Release|x64.Build.0 = Release|x64
69+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Release|x86.ActiveCfg = Release|Win32
70+
{68AA7C73-DF57-4B90-84F1-189EB30C3A65}.Release|x86.Build.0 = Release|Win32
5571
EndGlobalSection
5672
GlobalSection(SolutionProperties) = preSolution
5773
HideSolutionNode = FALSE

msvcstuff/vs2019/Exult.vcxproj

Lines changed: 0 additions & 94 deletions
Large diffs are not rendered by default.

msvcstuff/vs2019/Exult.vcxproj.filters

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@
1313
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
1414
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
1515
</Filter>
16-
<Filter Include="data">
17-
<UniqueIdentifier>{824b0bc2-4de5-42db-a120-3ada9c9ec32a}</UniqueIdentifier>
18-
</Filter>
19-
<Filter Include="data\bg">
20-
<UniqueIdentifier>{b6749ccd-f3bf-4a48-9d7a-d9abd2005b7d}</UniqueIdentifier>
21-
</Filter>
22-
<Filter Include="data\si">
23-
<UniqueIdentifier>{92539d23-e6d4-434a-8d46-9dfe8831da51}</UniqueIdentifier>
24-
</Filter>
2516
<Filter Include="audio">
2617
<UniqueIdentifier>{93823729-846b-4fc5-8384-ef7b60390558}</UniqueIdentifier>
2718
</Filter>
@@ -1455,27 +1446,6 @@
14551446
</ClInclude>
14561447
</ItemGroup>
14571448
<ItemGroup>
1458-
<CustomBuild Include="..\..\data\flx.in">
1459-
<Filter>data</Filter>
1460-
</CustomBuild>
1461-
<CustomBuild Include="..\..\data\bg\flx.in">
1462-
<Filter>data\bg</Filter>
1463-
</CustomBuild>
1464-
<CustomBuild Include="..\..\data\si\flx.in">
1465-
<Filter>data\si</Filter>
1466-
</CustomBuild>
1467-
<CustomBuild Include="..\..\data\bg\introsfx_sb.in">
1468-
<Filter>data\bg</Filter>
1469-
</CustomBuild>
1470-
<CustomBuild Include="..\..\data\bg\introsfx_mt.in">
1471-
<Filter>data\bg</Filter>
1472-
</CustomBuild>
1473-
<CustomBuild Include="..\..\data\bg\bg_paperdol.in">
1474-
<Filter>data\bg</Filter>
1475-
</CustomBuild>
1476-
<CustomBuild Include="..\..\data\bg\bg_mr_faces.in">
1477-
<Filter>data\bg</Filter>
1478-
</CustomBuild>
14791449
<CustomBuild Include="..\..\.git\index" />
14801450
</ItemGroup>
14811451
<ItemGroup>

0 commit comments

Comments
 (0)