Skip to content

Commit ea1eda1

Browse files
committed
New LuaJIT build system
1 parent 050cd9b commit ea1eda1

File tree

3 files changed

+93
-30
lines changed

3 files changed

+93
-30
lines changed

Externals/LuaJIT

Externals/luabind

src/engine.sln

Lines changed: 91 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26430.16
3+
VisualStudioVersion = 15.0.27019.1
44
MinimumVisualStudioVersion = 14.0.25420.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
66
EndProject
@@ -161,8 +161,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameSpy", "..\Externals\Gam
161161
EndProject
162162
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzo", "..\Externals\lzo.vcxproj", "{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}"
163163
EndProject
164-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "..\Externals\LuaJIT\src\luajit.vcxproj", "{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}"
165-
EndProject
166164
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
167165
EndProject
168166
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_static", "..\Externals\libogg_static.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
@@ -193,6 +191,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{49438080-7
193191
EndProject
194192
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2017_static", "..\Externals\pugixml_vs2017_static.vcxproj", "{07CF01C0-B887-499D-AD9C-799CB6A9FE64}"
195193
EndProject
194+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LuaJIT", "LuaJIT", "{DAEF6FB5-4F98-4B34-B049-8828EFEC9250}"
195+
EndProject
196+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildVm", "..\Externals\LuaJIT\src\BuildVm.vcxproj", "{58AE014E-0DA3-4D9B-9034-21984C305447}"
197+
EndProject
198+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minilua", "..\Externals\LuaJIT\src\minilua.vcxproj", "{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}"
199+
EndProject
200+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "..\Externals\LuaJIT\src\LuaJIT.vcxproj", "{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}"
201+
ProjectSection(ProjectDependencies) = postProject
202+
{58AE014E-0DA3-4D9B-9034-21984C305447} = {58AE014E-0DA3-4D9B-9034-21984C305447}
203+
EndProjectSection
204+
EndProject
196205
Global
197206
GlobalSection(SolutionConfigurationPlatforms) = preSolution
198207
Debug_Dedicated|Win32 = Debug_Dedicated|Win32
@@ -1338,30 +1347,6 @@ Global
13381347
{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|Win32.Build.0 = Release|Win32
13391348
{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.ActiveCfg = Release|x64
13401349
{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.Build.0 = Release|x64
1341-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
1342-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
1343-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
1344-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.Build.0 = Debug|x64
1345-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.ActiveCfg = Debug|Win32
1346-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.Build.0 = Debug|Win32
1347-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.ActiveCfg = Debug|x64
1348-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.Build.0 = Debug|x64
1349-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
1350-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
1351-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
1352-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.Build.0 = Release|x64
1353-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.ActiveCfg = Release|Win32
1354-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.Build.0 = Release|Win32
1355-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.ActiveCfg = Release|x64
1356-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.Build.0 = Release|x64
1357-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
1358-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.Build.0 = Release|Win32
1359-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.ActiveCfg = Release|x64
1360-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.Build.0 = Release|x64
1361-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.ActiveCfg = Release|Win32
1362-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.Build.0 = Release|Win32
1363-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.ActiveCfg = Release|x64
1364-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.Build.0 = Release|x64
13651350
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
13661351
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
13671352
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
@@ -1690,6 +1675,78 @@ Global
16901675
{07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|Win32.Build.0 = Release|Win32
16911676
{07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.ActiveCfg = Release|x64
16921677
{07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.Build.0 = Release|x64
1678+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
1679+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
1680+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
1681+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|x64.Build.0 = Debug|x64
1682+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|Win32.ActiveCfg = Debug|Win32
1683+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|Win32.Build.0 = Debug|Win32
1684+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|x64.ActiveCfg = Debug|x64
1685+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|x64.Build.0 = Debug|x64
1686+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
1687+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
1688+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
1689+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|x64.Build.0 = Release|x64
1690+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|Win32.ActiveCfg = Release|Win32
1691+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|Win32.Build.0 = Release|Win32
1692+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|x64.ActiveCfg = Release|x64
1693+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|x64.Build.0 = Release|x64
1694+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
1695+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|Win32.Build.0 = Release|Win32
1696+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|x64.ActiveCfg = Release|x64
1697+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|x64.Build.0 = Release|x64
1698+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|Win32.ActiveCfg = Release|Win32
1699+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|Win32.Build.0 = Release|Win32
1700+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|x64.ActiveCfg = Release|x64
1701+
{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|x64.Build.0 = Release|x64
1702+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
1703+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
1704+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
1705+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|x64.Build.0 = Debug|x64
1706+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|Win32.ActiveCfg = Debug|Win32
1707+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|Win32.Build.0 = Debug|Win32
1708+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|x64.ActiveCfg = Debug|x64
1709+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|x64.Build.0 = Debug|x64
1710+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
1711+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
1712+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
1713+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|x64.Build.0 = Release|x64
1714+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|Win32.ActiveCfg = Release|Win32
1715+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|Win32.Build.0 = Release|Win32
1716+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|x64.ActiveCfg = Release|x64
1717+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|x64.Build.0 = Release|x64
1718+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
1719+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|Win32.Build.0 = Release|Win32
1720+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|x64.ActiveCfg = Release|x64
1721+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|x64.Build.0 = Release|x64
1722+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|Win32.ActiveCfg = Release|Win32
1723+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|Win32.Build.0 = Release|Win32
1724+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|x64.ActiveCfg = Release|x64
1725+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|x64.Build.0 = Release|x64
1726+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
1727+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
1728+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
1729+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.Build.0 = Debug|x64
1730+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.ActiveCfg = Debug|Win32
1731+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.Build.0 = Debug|Win32
1732+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.ActiveCfg = Debug|x64
1733+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.Build.0 = Debug|x64
1734+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
1735+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
1736+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
1737+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.Build.0 = Release|x64
1738+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.ActiveCfg = Release|Win32
1739+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.Build.0 = Release|Win32
1740+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.ActiveCfg = Release|x64
1741+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.Build.0 = Release|x64
1742+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
1743+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.Build.0 = Release|Win32
1744+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.ActiveCfg = Release|x64
1745+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.Build.0 = Release|x64
1746+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.ActiveCfg = Release|Win32
1747+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.Build.0 = Release|Win32
1748+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.ActiveCfg = Release|x64
1749+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.Build.0 = Release|x64
16931750
EndGlobalSection
16941751
GlobalSection(SolutionProperties) = preSolution
16951752
HideSolutionNode = FALSE
@@ -1742,7 +1799,6 @@ Global
17421799
{1D137785-6E1B-4718-B800-F9380B945C9F} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4}
17431800
{67FF193E-2C20-402A-9026-9F5F6327503C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
17441801
{614AA57F-58D7-45A8-A5FF-93F04B05FAC6} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
1745-
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
17461802
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
17471803
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
17481804
{653F3841-3F26-49B9-AFCF-091DB4B67031} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
@@ -1756,6 +1812,13 @@ Global
17561812
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {49438080-78B8-4056-BDCB-4DACAD652C21}
17571813
{7885CF3C-EE04-4C67-9467-1FBF9A36B037} = {49438080-78B8-4056-BDCB-4DACAD652C21}
17581814
{07CF01C0-B887-499D-AD9C-799CB6A9FE64} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
1815+
{DAEF6FB5-4F98-4B34-B049-8828EFEC9250} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
1816+
{58AE014E-0DA3-4D9B-9034-21984C305447} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250}
1817+
{CDC5E78D-FF1C-4164-AE72-3578F60A27BA} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250}
1818+
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250}
1819+
EndGlobalSection
1820+
GlobalSection(ExtensibilityGlobals) = postSolution
1821+
SolutionGuid = {C5A32302-94F5-41B8-9606-017BB6BA69A6}
17591822
EndGlobalSection
17601823
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
17611824
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

0 commit comments

Comments
 (0)