Changeset 86a820e in opengl-game for NewOpenGLGame.vcxproj


Ignore:
Timestamp:
Jul 2, 2019, 12:39:27 AM (6 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
f898c5f
Parents:
aeedfb3 (diff), a8c958b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of medievaltech.com:opengl-game

File:
1 edited

Legend:

Unmodified
Added
Removed

  • NewOpenGLGame.vcxproj

    raeedfb3 r86a820e  
    2323    <ProjectGuid>{2D79C35D-6372-4B1F-8EFE-55F53BC9D0C7}</ProjectGuid>
    2424    <RootNamespace>NewOpenGLGame</RootNamespace>
    25     <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
     25    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    2626  </PropertyGroup>
    2727  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    2929    <ConfigurationType>Application</ConfigurationType>
    3030    <UseDebugLibraries>true</UseDebugLibraries>
    31     <PlatformToolset>v141</PlatformToolset>
     31    <PlatformToolset>v142</PlatformToolset>
    3232    <CharacterSet>MultiByte</CharacterSet>
    3333  </PropertyGroup>
    … …  
    3535    <ConfigurationType>Application</ConfigurationType>
    3636    <UseDebugLibraries>false</UseDebugLibraries>
    37     <PlatformToolset>v141</PlatformToolset>
     37    <PlatformToolset>v142</PlatformToolset>
    3838    <WholeProgramOptimization>true</WholeProgramOptimization>
    3939    <CharacterSet>MultiByte</CharacterSet>
    … …  
    4242    <ConfigurationType>Application</ConfigurationType>
    4343    <UseDebugLibraries>true</UseDebugLibraries>
    44     <PlatformToolset>v141</PlatformToolset>
     44    <PlatformToolset>v142</PlatformToolset>
    4545    <CharacterSet>MultiByte</CharacterSet>
    4646  </PropertyGroup>
    … …  
    4848    <ConfigurationType>Application</ConfigurationType>
    4949    <UseDebugLibraries>false</UseDebugLibraries>
    50     <PlatformToolset>v141</PlatformToolset>
     50    <PlatformToolset>v142</PlatformToolset>
    5151    <WholeProgramOptimization>true</WholeProgramOptimization>
    5252    <CharacterSet>MultiByte</CharacterSet>
    … …  
    7979  </PropertyGroup>
    8080  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     81    <IncludePath>include;$(IncludePath)</IncludePath>
     82    <LibraryPath>lib;$(LibraryPath)</LibraryPath>
     83  </PropertyGroup>
     84  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    8185    <IncludePath>include;$(IncludePath)</IncludePath>
    8286    <LibraryPath>lib;$(LibraryPath)</LibraryPath>
Note: See TracChangeset for help on using the changeset viewer.