New LuaJIT build system

OpenXRay · Nov 2, 2017 · ea1eda1 · ea1eda1
1 parent 050cd9b
commit ea1eda1
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 30 deletions.
diff --git a/Externals/LuaJIT b/Externals/LuaJIT
diff --git a/Externals/luabind b/Externals/luabind
diff --git a/src/engine.sln b/src/engine.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.27019.1
 MinimumVisualStudioVersion = 14.0.25420.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
 EndProject
@@ -161,8 +161,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameSpy", "..\Externals\Gam
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzo", "..\Externals\lzo.vcxproj", "{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "..\Externals\LuaJIT\src\luajit.vcxproj", "{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
 EndProject
 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
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml_vs2017_static", "..\Externals\pugixml_vs2017_static.vcxproj", "{07CF01C0-B887-499D-AD9C-799CB6A9FE64}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LuaJIT", "LuaJIT", "{DAEF6FB5-4F98-4B34-B049-8828EFEC9250}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildVm", "..\Externals\LuaJIT\src\BuildVm.vcxproj", "{58AE014E-0DA3-4D9B-9034-21984C305447}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minilua", "..\Externals\LuaJIT\src\minilua.vcxproj", "{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "..\Externals\LuaJIT\src\LuaJIT.vcxproj", "{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{58AE014E-0DA3-4D9B-9034-21984C305447} = {58AE014E-0DA3-4D9B-9034-21984C305447}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_Dedicated|Win32 = Debug_Dedicated|Win32
@@ -1338,30 +1347,6 @@ Global
 		{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|Win32.Build.0 = Release|Win32
 		{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.ActiveCfg = Release|x64
 		{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.Build.0 = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.Build.0 = Debug|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.Build.0 = Debug|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.ActiveCfg = Debug|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.Build.0 = Debug|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.Build.0 = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.ActiveCfg = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.Build.0 = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.ActiveCfg = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.Build.0 = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.Build.0 = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.ActiveCfg = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.Build.0 = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.ActiveCfg = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.Build.0 = Release|Win32
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.ActiveCfg = Release|x64
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.Build.0 = Release|x64
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
@@ -1690,6 +1675,78 @@ Global
 		{07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|Win32.Build.0 = Release|Win32
 		{07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.ActiveCfg = Release|x64
 		{07CF01C0-B887-499D-AD9C-799CB6A9FE64}.Release|x64.Build.0 = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug_Dedicated|x64.Build.0 = Debug|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|Win32.ActiveCfg = Debug|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|Win32.Build.0 = Debug|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|x64.ActiveCfg = Debug|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Debug|x64.Build.0 = Debug|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed_Dedicated|x64.Build.0 = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|Win32.ActiveCfg = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|Win32.Build.0 = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|x64.ActiveCfg = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Mixed|x64.Build.0 = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|Win32.Build.0 = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|x64.ActiveCfg = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release_Dedicated|x64.Build.0 = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|Win32.ActiveCfg = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|Win32.Build.0 = Release|Win32
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|x64.ActiveCfg = Release|x64
+		{58AE014E-0DA3-4D9B-9034-21984C305447}.Release|x64.Build.0 = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug_Dedicated|x64.Build.0 = Debug|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|Win32.Build.0 = Debug|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|x64.ActiveCfg = Debug|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Debug|x64.Build.0 = Debug|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed_Dedicated|x64.Build.0 = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|Win32.ActiveCfg = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|Win32.Build.0 = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|x64.ActiveCfg = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Mixed|x64.Build.0 = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|Win32.Build.0 = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|x64.ActiveCfg = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release_Dedicated|x64.Build.0 = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|Win32.ActiveCfg = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|Win32.Build.0 = Release|Win32
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|x64.ActiveCfg = Release|x64
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA}.Release|x64.Build.0 = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.ActiveCfg = Debug|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug_Dedicated|x64.Build.0 = Debug|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|Win32.Build.0 = Debug|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.ActiveCfg = Debug|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Debug|x64.Build.0 = Debug|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed_Dedicated|x64.Build.0 = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.ActiveCfg = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|Win32.Build.0 = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.ActiveCfg = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Mixed|x64.Build.0 = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|Win32.Build.0 = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.ActiveCfg = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release_Dedicated|x64.Build.0 = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.ActiveCfg = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.Build.0 = Release|Win32
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.ActiveCfg = Release|x64
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1742,7 +1799,6 @@ Global
 		{1D137785-6E1B-4718-B800-F9380B945C9F} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4}
 		{67FF193E-2C20-402A-9026-9F5F6327503C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{614AA57F-58D7-45A8-A5FF-93F04B05FAC6} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
-		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
@@ -1756,6 +1812,13 @@ Global
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {49438080-78B8-4056-BDCB-4DACAD652C21}
 		{7885CF3C-EE04-4C67-9467-1FBF9A36B037} = {49438080-78B8-4056-BDCB-4DACAD652C21}
 		{07CF01C0-B887-499D-AD9C-799CB6A9FE64} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{DAEF6FB5-4F98-4B34-B049-8828EFEC9250} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{58AE014E-0DA3-4D9B-9034-21984C305447} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250}
+		{CDC5E78D-FF1C-4164-AE72-3578F60A27BA} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250}
+		{632AEEB6-DC06-4E15-9551-B2B09A4B73C5} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C5A32302-94F5-41B8-9606-017BB6BA69A6}
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}