Skip to content

Commit

Permalink
k
Browse files Browse the repository at this point in the history
  • Loading branch information
Ingo Berg committed Jan 2, 2021
1 parent 12fbe99 commit b7e2e38
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
19 changes: 9 additions & 10 deletions galaxy-renderer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\Users\user\Documents\GitHub\Galaxy-Renderer\vsproject\dependencies\glew-2.1.0\lib\Release\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)dependencies\glew-2.1.0\lib\Release\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>xcopy /y /d $(SolutionDir)\..\particle.bmp $(OutDir)
Expand All @@ -129,14 +129,14 @@ xcopy /y /d $(SolutionDir)\..\star.bmp $(OutDir)</Command>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>glew32s.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\dependencies\glew-2.1.0\lib\Release\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>glew32s.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)dependencies\glew-2.1.0\lib\Release\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt</IgnoreSpecificDefaultLibraries>
</Link>
<PostBuildEvent>
<Command>xcopy /Y $(SolutionDir)..\assets\particle.bmp $(OutDir)
xcopy /Y $(SolutionDir).\assets\arial.ttf $(OutDir)
xcopy /Y $(SolutionDir).\assets\consola.ttf $(OutDir)</Command>
<Command>xcopy /Y $(SolutionDir)assets\arial.ttf $(OutDir)
xcopy /Y $(SolutionDir)assets\consola.ttf $(OutDir)</Command>
<Message>Copying assets to output folder</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -191,14 +191,13 @@ xcopy /y /d $(SolutionDir)\..\star.bmp $(OutDir)</Command>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>glew32s.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>glew32s.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\dependencies\glew-2.1.0\lib\Release\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmt</IgnoreSpecificDefaultLibraries>
</Link>
<PostBuildEvent>
<Command>xcopy /Y $(SolutionDir)\assets\particle.bmp $(OutDir)
xcopy /Y $(SolutionDir)\assets\arial.ttf $(OutDir)
xcopy /Y $(SolutionDir)\assets\consola.ttf $(OutDir)</Command>
<Command>xcopy /Y $(SolutionDir)assets\arial.ttf $(OutDir)
xcopy /Y $(SolutionDir)assets\consola.ttf $(OutDir)</Command>
<Message>Copying assets to output folder</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
Expand Down
2 changes: 0 additions & 2 deletions include/Types.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

#include <cstdint>

struct Vec3 final
{
float x, y, z;
Expand Down

0 comments on commit b7e2e38

Please sign in to comment.