Commit ffaacf0d authored by unknown's avatar unknown
Browse files

BUG#20739 

Improved definition of mysys configuration for -nt builds.


VC++Files/mysql.sln:
  Use the name 'nt' instead of 'Release' for configuration.
VC++Files/mysys/mysys.vcproj:
  Use the name 'nt' instead of 'Release' for configuration.
  Use separate output files for NT and non-NT configurations.
parent f659c1b7

VC++Files/mysql.sln

+8 −8
Original line number Diff line number Diff line
@@ -1110,8 +1110,8 @@ Global 
		{DB28DE80-837F-4497-9AA9-CC0A20584C98}.Release.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.ActiveCfg = TLS|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.Build.0 = TLS|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.ActiveCfg = Debug|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = Debug|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.ActiveCfg = TLS|Win32
@@ -1128,16 +1128,16 @@ Global 
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.Build.0 = Max|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.ActiveCfg = Max nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.Build.0 = Max nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.ActiveCfg = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.Build.0 = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.ActiveCfg = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.Build.0 = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.ActiveCfg = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.Build.0 = Release nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro gpl nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.ActiveCfg = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro nt.Build.0 = nt|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Release.Build.0 = Release|Win32

		{AC47623D-933C-4A80-83BB-B6AF7CB28B4B}.classic.ActiveCfg = classic|Win32

VC++Files/mysys/mysys.vcproj

+15 −15
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ 
		</Configuration>

		<Configuration

			Name="Max nt|Win32"

			OutputDirectory=".\max"

			IntermediateDirectory=".\max"

			OutputDirectory=".\max_nt"

			IntermediateDirectory=".\max_nt"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -125,10 +125,10 @@ 
				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\max/mysys.pch"

				AssemblerListingLocation=".\max/"

				ObjectFile=".\max/"

				ProgramDataBaseFileName=".\max/"

				PrecompiledHeaderFile=".\max_nt/mysys.pch"

				AssemblerListingLocation=".\max_nt/"

				ObjectFile=".\max_nt/"

				ProgramDataBaseFileName=".\max_nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>
@@ -136,7 +136,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile="..\lib_release\mysys-max.lib"

				OutputFile="..\lib_release\mysys-max-nt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>
@@ -209,9 +209,9 @@ 
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Release nt|Win32"

			OutputDirectory=".\release"

			IntermediateDirectory=".\release"

			Name="nt|Win32"

			OutputDirectory=".\nt"

			IntermediateDirectory=".\nt"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -225,10 +225,10 @@ 
				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\release/mysys.pch"

				AssemblerListingLocation=".\release/"

				ObjectFile=".\release/"

				ProgramDataBaseFileName=".\release/"

				PrecompiledHeaderFile=".\nt/mysys.pch"

				AssemblerListingLocation=".\nt/"

				ObjectFile=".\nt/"

				ProgramDataBaseFileName=".\nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>
@@ -236,7 +236,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile="..\lib_release\mysys.lib"

				OutputFile="..\lib_release\mysys-nt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>