Skip to content
This repository was archived by the owner on Dec 12, 2020. It is now read-only.

Commit 5478d59

Browse files
gutting a3 vcxproj to conform with no OpenGL rule
1 parent f88c881 commit 5478d59

14 files changed

Lines changed: 24 additions & 1226 deletions

Assignments/Ray Tracing/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# Ray Tracing
22

3-
43
### Table Of Contents
54
* [Contributors](#contributors)
6-
5+
76
## Contributors
87
**Student** | **ID**
98
:---:| ---

Assignments/Ray Tracing/Ray Tracing.vcxproj

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,14 @@
9191
<Optimization>Disabled</Optimization>
9292
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9393
<SDLCheck>true</SDLCheck>
94-
<AdditionalIncludeDirectories>$(GLM_INC_DIR);$(GLEW_INC_DIR);$(GLFW_INC_DIR);</AdditionalIncludeDirectories>
94+
<AdditionalIncludeDirectories>$(GLM_INC_DIR);</AdditionalIncludeDirectories>
9595
</ClCompile>
9696
<Link>
9797
<SubSystem>Console</SubSystem>
9898
<GenerateDebugInformation>true</GenerateDebugInformation>
99-
<AdditionalDependencies>glu32.lib;opengl32.lib;$(Configuration)/glfw3.lib;$(Configuration)/glew32d.lib;%(AdditionalDependencies)</AdditionalDependencies>
100-
<AdditionalLibraryDirectories>$(GLFW_LIB_DIR);$(GLEW_LIB_DIR);</AdditionalLibraryDirectories>
99+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
100+
<AdditionalLibraryDirectories>
101+
</AdditionalLibraryDirectories>
101102
</Link>
102103
</ItemDefinitionGroup>
103104
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -107,13 +108,14 @@
107108
<Optimization>Disabled</Optimization>
108109
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109110
<SDLCheck>true</SDLCheck>
110-
<AdditionalIncludeDirectories>$(GLM_INC_DIR);$(GLEW_INC_DIR);$(GLFW_INC_DIR);</AdditionalIncludeDirectories>
111+
<AdditionalIncludeDirectories>$(GLM_INC_DIR);</AdditionalIncludeDirectories>
111112
</ClCompile>
112113
<Link>
113114
<SubSystem>Console</SubSystem>
114115
<GenerateDebugInformation>true</GenerateDebugInformation>
115-
<AdditionalDependencies>glu32.lib;opengl32.lib;$(Configuration)/glfw3.lib;$(Configuration)/glew32d.lib;%(AdditionalDependencies)</AdditionalDependencies>
116-
<AdditionalLibraryDirectories>$(GLFW_LIB_DIR);$(GLEW_LIB_DIR);</AdditionalLibraryDirectories>
116+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
117+
<AdditionalLibraryDirectories>
118+
</AdditionalLibraryDirectories>
117119
</Link>
118120
</ItemDefinitionGroup>
119121
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -125,15 +127,16 @@
125127
<IntrinsicFunctions>true</IntrinsicFunctions>
126128
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127129
<SDLCheck>true</SDLCheck>
128-
<AdditionalIncludeDirectories>$(GLM_INC_DIR);$(GLEW_INC_DIR);$(GLFW_INC_DIR);</AdditionalIncludeDirectories>
130+
<AdditionalIncludeDirectories>$(GLM_INC_DIR);</AdditionalIncludeDirectories>
129131
</ClCompile>
130132
<Link>
131133
<SubSystem>Console</SubSystem>
132134
<EnableCOMDATFolding>true</EnableCOMDATFolding>
133135
<OptimizeReferences>true</OptimizeReferences>
134136
<GenerateDebugInformation>true</GenerateDebugInformation>
135-
<AdditionalDependencies>glu32.lib;opengl32.lib;$(Configuration)/glfw3.lib;$(Configuration)/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
136-
<AdditionalLibraryDirectories>$(GLFW_LIB_DIR);$(GLEW_LIB_DIR);</AdditionalLibraryDirectories>
137+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
138+
<AdditionalLibraryDirectories>
139+
</AdditionalLibraryDirectories>
137140
</Link>
138141
</ItemDefinitionGroup>
139142
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -145,34 +148,23 @@
145148
<IntrinsicFunctions>true</IntrinsicFunctions>
146149
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147150
<SDLCheck>true</SDLCheck>
148-
<AdditionalIncludeDirectories>$(GLM_INC_DIR);$(GLEW_INC_DIR);$(GLFW_INC_DIR);</AdditionalIncludeDirectories>
151+
<AdditionalIncludeDirectories>$(GLM_INC_DIR);</AdditionalIncludeDirectories>
149152
</ClCompile>
150153
<Link>
151154
<SubSystem>Console</SubSystem>
152155
<EnableCOMDATFolding>true</EnableCOMDATFolding>
153156
<OptimizeReferences>true</OptimizeReferences>
154157
<GenerateDebugInformation>true</GenerateDebugInformation>
155-
<AdditionalDependencies>glu32.lib;opengl32.lib;$(Configuration)/glfw3.lib;$(Configuration)/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
156-
<AdditionalLibraryDirectories>$(GLFW_LIB_DIR);$(GLEW_LIB_DIR);</AdditionalLibraryDirectories>
158+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
159+
<AdditionalLibraryDirectories>
160+
</AdditionalLibraryDirectories>
157161
</Link>
158162
</ItemDefinitionGroup>
159163
<ItemGroup>
160164
<Text Include="README.md" />
161165
</ItemGroup>
162166
<ItemGroup>
163-
<ClInclude Include="src\Camera.h" />
164-
<ClInclude Include="src\Cursor.h" />
165-
<ClInclude Include="src\DrawableObject.h" />
166-
<ClInclude Include="src\GlfwWindow.h" />
167-
<ClInclude Include="src\RenderMode.h" />
168-
<ClInclude Include="src\Shader.h" />
169-
</ItemGroup>
170-
<ItemGroup>
171-
<ClCompile Include="src\Camera.cpp" />
172-
<ClCompile Include="src\DrawableObject.cpp" />
173-
<ClCompile Include="src\GlfwWindow.cpp" />
174167
<ClCompile Include="src\RayTracing.cpp" />
175-
<ClCompile Include="src\Shader.cpp" />
176168
</ItemGroup>
177169
<ItemGroup>
178170
<None Include="shaders\fragment.shader" />

Assignments/Ray Tracing/Ray Tracing.vcxproj.filters

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,9 @@
1818
<Text Include="README.md" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<ClInclude Include="src\GlfwWindow.h">
22-
<Filter>Header Files</Filter>
23-
</ClInclude>
24-
<ClInclude Include="src\Shader.h">
25-
<Filter>Header Files</Filter>
26-
</ClInclude>
27-
<ClInclude Include="src\Camera.h">
28-
<Filter>Header Files</Filter>
29-
</ClInclude>
30-
<ClInclude Include="src\Cursor.h">
31-
<Filter>Header Files</Filter>
32-
</ClInclude>
33-
<ClInclude Include="src\DrawableObject.h">
34-
<Filter>Header Files</Filter>
35-
</ClInclude>
36-
<ClInclude Include="src\RenderMode.h">
37-
<Filter>Header Files</Filter>
38-
</ClInclude>
39-
</ItemGroup>
40-
<ItemGroup>
41-
<ClCompile Include="src\GlfwWindow.cpp">
42-
<Filter>Source Files</Filter>
43-
</ClCompile>
44-
<ClCompile Include="src\Shader.cpp">
45-
<Filter>Source Files</Filter>
46-
</ClCompile>
4721
<ClCompile Include="src\RayTracing.cpp">
4822
<Filter>Source Files</Filter>
4923
</ClCompile>
50-
<ClCompile Include="src\Camera.cpp">
51-
<Filter>Source Files</Filter>
52-
</ClCompile>
53-
<ClCompile Include="src\DrawableObject.cpp">
54-
<Filter>Source Files</Filter>
55-
</ClCompile>
5624
</ItemGroup>
5725
<ItemGroup>
5826
<None Include="shaders\fragment.shader">

Assignments/Ray Tracing/src/Camera.cpp

Lines changed: 0 additions & 86 deletions
This file was deleted.

Assignments/Ray Tracing/src/Camera.h

Lines changed: 0 additions & 73 deletions
This file was deleted.

Assignments/Ray Tracing/src/Cursor.h

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)