| default-Copy.js | default.js | |||
|---|---|---|---|---|
| skipping to change at line 134 | skipping to change at line 134 | |||
| } | } | |||
| function AddSpecificConfig(proj, strProjectName, bEmptyProject, strAppType) | function AddSpecificConfig(proj, strProjectName, bEmptyProject, strAppType) | |||
| { | { | |||
| try | try | |||
| { | { | |||
| var bMFC = wizard.FindSymbol("SUPPORT_MFC"); | var bMFC = wizard.FindSymbol("SUPPORT_MFC"); | |||
| var bATL = wizard.FindSymbol("SUPPORT_ATL"); | var bATL = wizard.FindSymbol("SUPPORT_ATL"); | |||
| var config = proj.Object.Configurations("Debug"); | var config = proj.Object.Configurations("Debug"); | |||
| config.CharacterSet = charSetUNICODE; | config.CharacterSet = charSetNotSet; // [***] changed from charSetUnicode | |||
| if (strAppType == "LIB") | if (strAppType == "LIB") | |||
| config.ConfigurationType = typeStaticLibrary; | config.ConfigurationType = typeStaticLibrary; | |||
| else if (strAppType == "DLL") | else if (strAppType == "DLL") | |||
| config.ConfigurationType = typeDynamicLibrary; | config.ConfigurationType = typeDynamicLibrary; | |||
| var CLTool = config.Tools("VCCLCompilerTool"); | var CLTool = config.Tools("VCCLCompilerTool"); | |||
| // CLTool.PrecompiledHeaderFile = "$(OutDir)" + strProjectName + ".pch"; | // CLTool.PrecompiledHeaderFile = "$(OutDir)" + strProjectName + ".pch"; | |||
| CLTool.CompileAs = compileAsC; // [***] added | ||||
| var strDefines = CLTool.PreprocessorDefinitions; | var strDefines = CLTool.PreprocessorDefinitions; | |||
| if (strDefines != "") strDefines += ";"; | if (strDefines != "") strDefines += ";"; | |||
| strDefines += GetPlatformDefine(config); | strDefines += GetPlatformDefine(config); | |||
| strDefines += "_DEBUG"; | strDefines += "_DEBUG"; | |||
| switch(strAppType) | switch(strAppType) | |||
| { | { | |||
| case "CONSOLE": | case "CONSOLE": | |||
| strDefines += ";_CONSOLE"; | strDefines += ";_CONSOLE"; | |||
| if (bMFC) | if (bMFC) | |||
| skipping to change at line 175 | skipping to change at line 177 | |||
| config.UseOfMFC = useMfcDynamic; | config.UseOfMFC = useMfcDynamic; | |||
| break; | break; | |||
| case "WIN": | case "WIN": | |||
| strDefines += ";_WINDOWS"; | strDefines += ";_WINDOWS"; | |||
| if (bMFC) | if (bMFC) | |||
| config.UseOfMFC = useMfcDynamic; | config.UseOfMFC = useMfcDynamic; | |||
| default: | default: | |||
| break; | break; | |||
| } | } | |||
| strDefines += ";_CRT_SECURE_NO_DEPRECATE"; // [***] added | ||||
| CLTool.PreprocessorDefinitions = strDefines; | CLTool.PreprocessorDefinitions = strDefines; | |||
| if (bEmptyProject) | if (bEmptyProject) | |||
| CLTool.UsePrecompiledHeader = pchNone; | CLTool.UsePrecompiledHeader = pchNone; | |||
| if (strAppType != "LIB") | if (strAppType != "LIB") | |||
| { | { | |||
| var LinkTool = config.Tools("VCLinkerTool"); | var LinkTool = config.Tools("VCLinkerTool"); | |||
| LinkTool.GenerateDebugInformation = true; | LinkTool.GenerateDebugInformation = true; | |||
| LinkTool.LinkIncremental = linkIncrementalYes; | LinkTool.LinkIncremental = linkIncrementalYes; | |||
| if (strAppType == "DLL" || strAppType == "WIN") | if (strAppType == "DLL" || strAppType == "WIN") | |||
| LinkTool.SubSystem = subSystemWindows; | LinkTool.SubSystem = subSystemWindows; | |||
| else | else | |||
| LinkTool.SubSystem = subSystemConsole; | LinkTool.SubSystem = subSystemConsole; | |||
| } | } | |||
| config = proj.Object.Configurations.Item("Release"); | config = proj.Object.Configurations.Item("Release"); | |||
| config.CharacterSet = charSetUNICODE; | config.CharacterSet = charSetNotSet; // [***] changed from charSetUnicode | |||
| if (strAppType == "LIB") | if (strAppType == "LIB") | |||
| config.ConfigurationType = typeStaticLibrary; | config.ConfigurationType = typeStaticLibrary; | |||
| else if (strAppType == "DLL") | else if (strAppType == "DLL") | |||
| config.ConfigurationType = typeDynamicLibrary; | config.ConfigurationType = typeDynamicLibrary; | |||
| var CLTool = config.Tools("VCCLCompilerTool"); | var CLTool = config.Tools("VCCLCompilerTool"); | |||
| CLTool.CompileAs = compileAsC; // [***] added | ||||
| var strDefines = CLTool.PreprocessorDefinitions; | var strDefines = CLTool.PreprocessorDefinitions; | |||
| if (strDefines != "") strDefines += ";"; | if (strDefines != "") strDefines += ";"; | |||
| strDefines += GetPlatformDefine(config); | strDefines += GetPlatformDefine(config); | |||
| strDefines += "NDEBUG"; | strDefines += "NDEBUG"; | |||
| if (bEmptyProject) | if (bEmptyProject) | |||
| CLTool.UsePrecompiledHeader = pchNone; | CLTool.UsePrecompiledHeader = pchNone; | |||
| switch(strAppType) | switch(strAppType) | |||
| { | { | |||
| skipping to change at line 232 | skipping to change at line 236 | |||
| strDefines += strExports; | strDefines += strExports; | |||
| break; | break; | |||
| case "WIN": | case "WIN": | |||
| strDefines += ";_WINDOWS"; | strDefines += ";_WINDOWS"; | |||
| if (bMFC) | if (bMFC) | |||
| config.UseOfMFC = useMfcDynamic; | config.UseOfMFC = useMfcDynamic; | |||
| default: | default: | |||
| break; | break; | |||
| } | } | |||
| strDefines += ";_CRT_SECURE_NO_DEPRECATE"; // [***] added | ||||
| CLTool.PreprocessorDefinitions = strDefines; | CLTool.PreprocessorDefinitions = strDefines; | |||
| if (strAppType != "LIB") | if (strAppType != "LIB") | |||
| { | { | |||
| var LinkTool = config.Tools("VCLinkerTool"); | var LinkTool = config.Tools("VCLinkerTool"); | |||
| LinkTool.GenerateDebugInformation = true; | LinkTool.GenerateDebugInformation = true; | |||
| LinkTool.LinkIncremental = linkIncrementalNo; | LinkTool.LinkIncremental = linkIncrementalNo; | |||
| if (strAppType == "DLL" || strAppType == "WIN") | if (strAppType == "DLL" || strAppType == "WIN") | |||
| LinkTool.SubSystem = subSystemWindows; | LinkTool.SubSystem = subSystemWindows; | |||
| End of changes. 6 change blocks. | ||||
| 2 lines changed or deleted | 7 lines changed or added | |||
This html diff was produced by rfcdiff 1.42. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ | ||||