Merge pull request #718 from Blizzard/add-notset-characterset

Adding support for NotSet characterset in VS2010+ (#79)

src/_premake_init.lua

@@ -145,6 +145,7 @@
 		kind = "string",
 		allowed = {
 			"Default",
+			"ASCII",
 			"MBCS",
 			"Unicode",
 		}

src/actions/vstudio/vs2010_vcxproj.lua

@@ -1168,7 +1168,13 @@
 
 	function m.characterSet(cfg)
 		if not vstudio.isMakefile(cfg) then
-			m.element("CharacterSet", nil, iif(cfg.characterset == p.MBCS, "MultiByte", "Unicode"))
+			local charactersets = {
+				ASCII = "NotSet",
+				MBCS = "MultiByte",
+				Unicode = "Unicode",
+				Default = "Unicode"
+			}
+			m.element("CharacterSet", nil, charactersets[cfg.characterset])
 		end
 	end
 

src/tools/msc.lua

@@ -138,6 +138,7 @@
 			Default = { '/D"_UNICODE"', '/D"UNICODE"' },
 			MBCS = '/D"_MBCS"',
 			Unicode = { '/D"_UNICODE"', '/D"UNICODE"' },
+			ASCII = { },
 		}
 	}
 

tests/actions/vstudio/vc2010/test_character_set.lua

@@ -46,3 +46,12 @@
 <CharacterSet>MultiByte</CharacterSet>
 		]]
 	end
+
+	function suite.onASCII()
+		characterset "ASCII"
+		prepare()
+		test.capture [[
+<CharacterSet>NotSet</CharacterSet>
+		]]
+	end
+

tests/tools/test_msc.lua

@@ -414,6 +414,12 @@
 		test.contains('/D"_MBCS"', msc.getdefines(cfg.defines, cfg))
 	end
 
+	function suite.cflags_onCharSetASCII()
+		characterset "ASCII"
+		prepare()
+		test.excludes({'/D"_MBCS"', '/D"_UNICODE"'}, msc.getdefines(cfg.defines, cfg))
+	end
+
 
 --
 -- Check handling of system search paths.