Ticket #7741: 0008-create_project-Update-for-VS2010-RTM.patch

File 0008-create_project-Update-for-VS2010-RTM.patch, 7.3 KB (added by Templier, 14 years ago)

8 - Update for VS2010 RTM

  • tools/create_msvc/create_msvc.cpp

     
    18401840
    18411841#define OUTPUT_PROPERTIES_MSBUILD(config, properties) \
    18421842        project << "\t<ImportGroup Condition=\"'$(Configuration)|$(Platform)'=='" << config << "'\" Label=\"PropertySheets\">\n" \
    1843                    "\t\t<Import Project=\"$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props\" Condition=\"exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')\" />\n" \
     1843                   "\t\t<Import Project=\"$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props\" Condition=\"exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')\" Label=\"LocalAppDataPlatform\" />\n" \
    18441844                   "\t\t<Import Project=\"" << properties << "\" />\n" \
    18451845                   "\t</ImportGroup>\n"
    18461846
    … …  
    18901890
    18911891        // Project version number
    18921892        project << "\t<PropertyGroup>\n"
    1893                    "\t\t<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>\n"; // FIXME: update temporary entry _ProjectFileVersion
     1893                   "\t\t<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\n";
    18941894
    18951895        if (name == "scummvm")
    18961896                project << "<ExecutablePath>$(SCUMMVM_LIBS)\\bin;$(VCInstallDir)bin;$(WindowsSdkDir)bin\\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\\Tools\\bin;$(VSInstallDir)Common7\\tools;$(VSInstallDir)Common7\\ide;$(ProgramFiles)\\HTML Help Workshop;$(FrameworkSDKDir)\\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\\SysWow64;$(FxCopDir);$(PATH)</ExecutablePath>\n"
    … …  
    20412041        project << "\t</ItemDefinitionGroup>\n";
    20422042}
    20432043
    2044 void MSBuildProvider::outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix) {
    2045         // FIXME: update temporary entries _ProjectFileVersion & _PropertySheetDisplayName
     2044void MSBuildProvider::outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix) {       
    20462045        properties << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
    20472046                      "<Project DefaultTargets=\"Build\" ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
    20482047                      "<PropertyGroup>\n"
    2049                       "<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>\n"
     2048                      "<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\n"
    20502049                      "<_PropertySheetDisplayName>ScummVM_Global</_PropertySheetDisplayName>\n"
    20512050                      "<OutDir>$(Configuration)" << bits << "\\</OutDir>\n"
    20522051                      "<IntDir>$(Configuration)" << bits << "/$(ProjectName)\\</IntDir>\n"
    … …  
    20872086        if (!properties)
    20882087                error("Could not open \"" + setup.outputDir + '/' + "ScummVM_" + outputType + (isWin32 ? "" : "64") + getPropertiesExtension() + "\" for writing");
    20892088
    2090         // FIXME: update temporary entries _ProjectFileVersion & _PropertySheetDisplayName
    20912089        properties << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
    20922090                      "<Project DefaultTargets=\"Build\" ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
    20932091                      "\t<ImportGroup Label=\"PropertySheets\">\n"
    20942092                      "\t\t<Import Project=\"ScummVM_Global" << (isWin32 ? "" : "64") << ".props\" />\n"
    20952093                      "\t</ImportGroup>\n"
    20962094                      "\t<PropertyGroup>\n"
    2097                       "\t\t<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>\n"
     2095                      "\t\t<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\n"
    20982096                      "\t\t<_PropertySheetDisplayName>ScummVM_" << outputType << outputBitness << "</_PropertySheetDisplayName>\n"
    20992097                      "\t\t<LinkIncremental>" << (isRelease ? "false" : "true") << "</LinkIncremental>\n"
    21002098                      "\t</PropertyGroup>\n"
    … …  
    21362134}
    21372135
    21382136#define OUTPUT_NASM_COMMAND_MSBUILD(config) \
    2139         projectFile << "\t\t\t<Command Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">nasm.exe -f win32 -g -o \"$(IntDir)" << (isDuplicate ? (*entry).prefix : "") << "%(FileName).obj\" \"%(FullPath)\"</Command>\n" \
    2140                        "\t\t\t<Outputs Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">$(IntDir)" << (isDuplicate ? (*entry).prefix : "") << "%(FileName).obj;%(Outputs)</Outputs>\n";
     2137        projectFile << "\t\t\t<Command Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">nasm.exe -f win32 -g -o \"$(IntDir)" << (isDuplicate ? (*entry).prefix : "") << "%(Filename).obj\" \"%(FullPath)\"</Command>\n" \
     2138                       "\t\t\t<Outputs Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">$(IntDir)" << (isDuplicate ? (*entry).prefix : "") << "%(Filename).obj;%(Outputs)</Outputs>\n";
    21412139
    21422140#define OUPUT_OBJECT_FILENAME_MSBUILD(config, platform, prefix) \
    2143         projectFile << "\t\t<ObjectFileName Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|" << platform << "'\">$(IntDir)" << prefix << "%(FileName).obj</ObjectFileName>\n" \
    2144                        "\t\t<XMLDocumentationFileName Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|" << platform << "'\">$(IntDir)" << prefix << "%(FileName).xdc</XMLDocumentationFileName>\n";
     2141        projectFile << "\t\t<ObjectFileName Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|" << platform << "'\">$(IntDir)" << prefix << "%(Filename).obj</ObjectFileName>\n" \
     2142                       "\t\t<XMLDocumentationFileName Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|" << platform << "'\">$(IntDir)" << prefix << "%(Filename).xdc</XMLDocumentationFileName>\n";
    21452143
    21462144#define OUPUT_FILES_MSBUILD(files, action) \
    21472145        if (!files.empty()) { \

  • tools/create_msvc/msvc10/create_msvc.vcxproj

     
    2828  <ImportGroup Label="ExtensionSettings">
    2929  </ImportGroup>
    3030  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    31     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     31    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3232  </ImportGroup>
    3333  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    34     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     34    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3535  </ImportGroup>
    3636  <PropertyGroup Label="UserMacros" />
    3737  <PropertyGroup>
    38     <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
     38    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    3939    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    4040    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
    4141    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>