From 6c7b1939d8373e1d2bfd4679e6ca3578e2ca965d Mon Sep 17 00:00:00 2001
From: liamDevine <unknown>
Date: Sat, 30 Apr 2011 00:57:49 +0100
Subject: [PATCH] ignore entry point in Manged C++

---
 src/actions/vstudio/vs2010_vcxproxj.lua     |  4 ++--
 tests/actions/vstudio/test_vs2010_flags.lua | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/actions/vstudio/vs2010_vcxproxj.lua b/src/actions/vstudio/vs2010_vcxproxj.lua
index bdc6014c..aaab4550 100644
--- a/src/actions/vstudio/vs2010_vcxproxj.lua
+++ b/src/actions/vstudio/vs2010_vcxproxj.lua
@@ -320,7 +320,7 @@
 			if cfg.platform == "x64"
 				or cfg.flags.Managed 
 				or premake.config.isoptimizedbuild(cfg.flags)
-				or cfg.flags.NoEditAndContinue -- then
+				or cfg.flags.NoEditAndContinue
 			then
 					debug_info = "ProgramDatabase"
 			else
@@ -494,7 +494,7 @@
 							
 			common_link_section(cfg)
 			
-			if vc2010.config_type(cfg) == 'Application' and not cfg.flags.WinMain then
+			if vc2010.config_type(cfg) == 'Application' and not cfg.flags.WinMain and not cfg.flags.Managed then
 				_p(3,'<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>')
 			end
 
diff --git a/tests/actions/vstudio/test_vs2010_flags.lua b/tests/actions/vstudio/test_vs2010_flags.lua
index 9c5dbd33..715dc270 100644
--- a/tests/actions/vstudio/test_vs2010_flags.lua
+++ b/tests/actions/vstudio/test_vs2010_flags.lua
@@ -320,9 +320,9 @@ end
 
 function vs10_managedFlag.globals_bufferContainsKeywordManagedCProj()
 	local sln, prj = vs10_managedFlag_setOnProject()
-	--HACK ALERT
-	--For some reason the flags are not set on a proj when testing (yet they are recorded in prj.blocks)
-	--whilst in normal run mode, flags are set on the project ?
+	--HACK ALERT 
+	--For some reason the flags are not set on a proj when testing (yet they are recorded in prj.blocks) 
+	--whilst in normal run mode, flags are set on the project ? 
 	prj.flags = {["Managed"]=1}
 	local buffer = get_managed_buffer(sln,prj)
 	test.string_contains(buffer,'<PropertyGroup Label="Globals">.*<Keyword>ManagedCProj</Keyword>.*</PropertyGroup>')
@@ -372,3 +372,8 @@ function vs10_managedFlag.noOptimisationFlag_basicRuntimeChecksNotFoundInBuffer(
 	test.string_does_not_contain(buffer,'<BasicRuntimeChecks>.*</BasicRuntimeChecks>')
 end
 
+function vs10_managedFlag.applictionWithOutWinMain_EntryPointSymbolNotFoundInBuffer()
+	local sln, prj = vs10_managedFlag_setOnProject()
+	local buffer = get_managed_buffer(sln,prj)
+	test.string_does_not_contain(buffer,'<EntryPointSymbol>.*</EntryPointSymbol>')
+end