Skip to content

Commit

Permalink
Merge branch 'ai'
Browse files Browse the repository at this point in the history
  • Loading branch information
gue-ni committed Feb 18, 2023
2 parents fd0ee75 + ceabc78 commit 494c4a4
Show file tree
Hide file tree
Showing 32 changed files with 7,761 additions and 1,000 deletions.
2 changes: 1 addition & 1 deletion OpenGL_Flightsim.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32825.248
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGL_Flightsim", "OpenGL_Flightsim\OpenGL_Flightsim.vcxproj", "{6BDFE5FF-8944-421E-B5FC-3FA9ACF3522B}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flightsim", "OpenGL_Flightsim\OpenGL_Flightsim.vcxproj", "{6BDFE5FF-8944-421E-B5FC-3FA9ACF3522B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
1 change: 1 addition & 0 deletions OpenGL_Flightsim/OpenGL_Flightsim.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ xcopy /y /i /s $(ProjectDir)shaders $(OutDir)shaders</Command>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\jakob\Documents\libraries\glew-2.1.0\include;C:\Users\jakob\Documents\libraries\SDL2\include;C:\Users\jakob\Documents\libraries\glm-0.9.9.8\glm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp20</LanguageStandard>
<DebugInformationFormat>None</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down
Loading

0 comments on commit 494c4a4

Please sign in to comment.