Changeset 4813066 in opengl-game


Ignore:
Timestamp:
Jun 30, 2017, 1:39:23 AM (8 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
1f63bdb
Parents:
fe70cd3
Message:

Convert the VC++ project to VS2017 and update the Windows build instructions in the README

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    rfe70cd3 r4813066  
    88.vs/
    99*.filters
     10include/
     11lib/
    1012Debug/
    1113Release/

  • OpenGLGame.vcxproj

    rfe70cd3 r4813066  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Win32">
    … …  
    2222    <ProjectGuid>{592F30FE-3B41-4EE6-A544-23F924C8A1C0}</ProjectGuid>
    2323    <Keyword>Win32Proj</Keyword>
     24    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
    2425  </PropertyGroup>
    2526  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    … …  
    2728    <ConfigurationType>Application</ConfigurationType>
    2829    <UseDebugLibraries>true</UseDebugLibraries>
    29     <PlatformToolset>v140</PlatformToolset>
     30    <PlatformToolset>v141</PlatformToolset>
    3031  </PropertyGroup>
    3132  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    3233    <ConfigurationType>Application</ConfigurationType>
    3334    <UseDebugLibraries>false</UseDebugLibraries>
    34     <PlatformToolset>v140</PlatformToolset>
     35    <PlatformToolset>v141</PlatformToolset>
    3536  </PropertyGroup>
    3637  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3738    <ConfigurationType>Application</ConfigurationType>
    3839    <UseDebugLibraries>true</UseDebugLibraries>
    39     <PlatformToolset>v140</PlatformToolset>
     40    <PlatformToolset>v141</PlatformToolset>
    4041  </PropertyGroup>
    4142  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    4243    <ConfigurationType>Application</ConfigurationType>
    4344    <UseDebugLibraries>false</UseDebugLibraries>
    44     <PlatformToolset>v140</PlatformToolset>
     45    <PlatformToolset>v141</PlatformToolset>
    4546  </PropertyGroup>
    4647  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    … …  
    6465  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    6566    <LinkIncremental>true</LinkIncremental>
    66     <IncludePath>D:\Visual Studio Projects\include;$(IncludePath)</IncludePath>
    67     <LibraryPath>D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
     67    <IncludePath>C:\Users\dportnoy\Desktop\opengl-game\include;D:\Visual Studio Projects\include;$(IncludePath)</IncludePath>
     68    <LibraryPath>C:\Users\dportnoy\Desktop\opengl-game\lib;D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
    6869  </PropertyGroup>
    6970  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    7273    <LibraryPath>D:\Visual Studio Projects\lib;$(LibraryPath)</LibraryPath>
    7374  </PropertyGroup>
     75  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     76    <IncludePath>C:\Users\dportnoy\Desktop\opengl-game\include;C:\Users\dportnoy\Desktop\opengl-game\include;$(IncludePath)</IncludePath>
     77    <LibraryPath>C:\Users\dportnoy\Desktop\opengl-game\lib;C:\Users\dportnoy\Desktop\opengl-game\lib;$(LibraryPath)</LibraryPath>
     78  </PropertyGroup>
    7479  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    7580    <ClCompile>
    76       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     81      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    7782      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    7883      <WarningLevel>Level3</WarningLevel>
    … …  
    108113    </Link>
    109114  </ItemDefinitionGroup>
     115  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     116    <Link>
     117      <AdditionalDependencies>
     118      </AdditionalDependencies>
     119    </Link>
     120  </ItemDefinitionGroup>
    110121  <ItemGroup>
    111     <ClCompile Include="game.cpp" />
     122    <ClCompile Include="common\controls-new.cpp" />
     123    <ClCompile Include="common\shader.cpp" />
     124    <ClCompile Include="mygame.cpp" />
    112125  </ItemGroup>
    113126  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • README.txt

    rfe70cd3 r4813066  
    1 TODO: Make sure the instructions in this README still work and, if not, update them
    2 
    31Installation Instructions for Linux
    42---------------------------------------
    … …  
    2422---------------------------------------
    2523
    26 Download the precompiled 32bit binaries of GLFW and GLEW.
    27 Create /lib and /include folders and add the paths to those folders to the
    28 VC++ project. Copy the include/GL and include/GLFW folders into your /include
    29 folder and all the files in the include folders of both libraries into your /lib
    30 folder. This should be enough to compile and run the project.
     24Download the precompiled 32bit binaries of GLFW, GLEW, and glm (a header-only
     25library). Create lib/ and include/ folders in the root opengl-game directory
     26you cloned. Copy the include/GL/, include/GLFW/, and glm/ folders into your
     27include/ folder and all the files in the lib/ folders of the GLFW and GLEW
     28libraries into your lib/ folder (glm has no lib/ folder). This should be enough
     29to compile and run the project.
Note: See TracChangeset for help on using the changeset viewer.