Browse Source

Lua5.4多类型编译支持。

jianfeng1.wang 2 years ago
parent
commit
9f3a8dd09e
2 changed files with 412 additions and 23 deletions
  1. 20 20
      Lua/Lua/Lua.sln
  2. 392 3
      Lua/Lua/Lua5.4/Lua5.4.vcproj

+ 20 - 20
Lua/Lua/Lua.sln

@@ -83,26 +83,26 @@ Global
 		{AA9348AD-155D-4A97-9EE4-E6BB51BD3CBE}.Release_MTLIB|Win32.Build.0 = Release_MTLIB|Win32
 		{AA9348AD-155D-4A97-9EE4-E6BB51BD3CBE}.Release|Win32.ActiveCfg = Release_MTLIB|Win32
 		{AA9348AD-155D-4A97-9EE4-E6BB51BD3CBE}.Release|Win32.Build.0 = Release_MTLIB|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDDLL|Win32.ActiveCfg = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDDLL|Win32.Build.0 = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDLIB|Win32.ActiveCfg = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDLIB|Win32.Build.0 = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTDLL|Win32.ActiveCfg = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTDLL|Win32.Build.0 = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTLIB|Win32.ActiveCfg = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTLIB|Win32.Build.0 = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug|Win32.Build.0 = Debug|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDDLL|Win32.ActiveCfg = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDDLL|Win32.Build.0 = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDLIB|Win32.ActiveCfg = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDLIB|Win32.Build.0 = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTDLL|Win32.ActiveCfg = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTDLL|Win32.Build.0 = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTLIB|Win32.ActiveCfg = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTLIB|Win32.Build.0 = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release|Win32.ActiveCfg = Release|Win32
-		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release|Win32.Build.0 = Release|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDDLL|Win32.ActiveCfg = Debug_MDDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDDLL|Win32.Build.0 = Debug_MDDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDLIB|Win32.ActiveCfg = Debug_MDLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MDLIB|Win32.Build.0 = Debug_MDLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTDLL|Win32.ActiveCfg = Debug_MTDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTDLL|Win32.Build.0 = Debug_MTDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTLIB|Win32.ActiveCfg = Debug_MTLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug_MTLIB|Win32.Build.0 = Debug_MTLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug|Win32.ActiveCfg = Debug_MTLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Debug|Win32.Build.0 = Debug_MTLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDDLL|Win32.ActiveCfg = Release_MDDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDDLL|Win32.Build.0 = Release_MDDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDLIB|Win32.ActiveCfg = Release_MDLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MDLIB|Win32.Build.0 = Release_MDLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTDLL|Win32.ActiveCfg = Release_MTDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTDLL|Win32.Build.0 = Release_MTDLL|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTLIB|Win32.ActiveCfg = Release_MTLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release_MTLIB|Win32.Build.0 = Release_MTLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release|Win32.ActiveCfg = Release_MTLIB|Win32
+		{E87D0A28-B6AC-4771-9E17-EB0FE677D8AB}.Release|Win32.Build.0 = Release_MTLIB|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 392 - 3
Lua/Lua/Lua5.4/Lua5.4.vcproj

@@ -17,7 +17,7 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
+			Name="Debug_MDDLL|Win32"
 			OutputDirectory="..\..\..\..\..\bin\Lua\"
 			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -48,6 +48,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -88,7 +89,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Release_MDDLL|Win32"
 			OutputDirectory="..\..\..\..\..\bin\Lua\"
 			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -114,12 +115,337 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LUA_BUILD_AS_DLL"
+				PreprocessorDefinitions="WIN32;NDEBUG;LUA_BUILD_AS_DLL"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_MDLIB|Win32"
+			OutputDirectory="..\..\..\..\..\bin\Lua\"
+			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_MTDLL|Win32"
+			OutputDirectory="..\..\..\..\..\bin\Lua\"
+			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;LUA_BUILD_AS_DLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_MTLIB|Win32"
+			OutputDirectory="..\..\..\..\..\bin\Lua\"
+			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_MDLIB|Win32"
+			OutputDirectory="..\..\..\..\..\bin\Lua\"
+			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_MTDLL|Win32"
+			OutputDirectory="..\..\..\..\..\bin\Lua\"
+			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;LUA_BUILD_AS_DLL"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -161,6 +487,69 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release_MTLIB|Win32"
+			OutputDirectory="..\..\..\..\..\bin\Lua\"
+			IntermediateDirectory="$(OutDir)obj5.4\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>