Project Update

Pecas-Dev · Sep 6, 2024 · 38f7e86 · 38f7e86
1 parent 65c2dd7
commit 38f7e86
Show file tree

Hide file tree

Showing 25 changed files with 158 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,7 +30,6 @@
 *.lai
 *.la
 *.a
-*.lib
 
 # Executables
 *.exe

diff --git a/Dependencies/GLEW/lib/Win32/glew32.lib b/Dependencies/GLEW/lib/Win32/glew32.lib
diff --git a/Dependencies/GLEW/lib/Win32/glew32s.lib b/Dependencies/GLEW/lib/Win32/glew32s.lib
diff --git a/Dependencies/GLFW/include/GLFW/glfw3.h → Dependencies/GLFW/include/glfw3.h b/Dependencies/GLFW/include/GLFW/glfw3.h → Dependencies/GLFW/include/glfw3.h
diff --git a/Dependencies/GLFW/include/GLFW/glfw3native.h → Dependencies/GLFW/include/glfw3native.h b/Dependencies/GLFW/include/GLFW/glfw3native.h → Dependencies/GLFW/include/glfw3native.h
diff --git a/Dependencies/GLFW/lib-vc2022/glfw3.lib b/Dependencies/GLFW/lib-vc2022/glfw3.lib
diff --git a/OpenGL1/OpenGL1.vcxproj b/OpenGL1/OpenGL1.vcxproj
@@ -317,7 +317,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{e5fbcf52-0ca6-4d72-be79-833bd2cd5192}</ProjectGuid>
     <RootNamespace>OpenGL1</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -374,6 +374,9 @@
     <IntDir>$(SolutionDir)bin\intermediates\$(Platform)\$(Configuration)\</IntDir>
     <IncludePath>OpenGL1/include/;OpenGL1/vendor/;OpenGL1/source/;OpenGL1/vendor/Math/glm/;$(IncludePath)</IncludePath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>OpenGL1/include/vendor;OpenGL1/include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -385,7 +388,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)Dependencies\GLFW\lib-vc2022;$(SolutionDir)Dependencies\GLEW\lib\Release\Win32</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)Dependencies\GLFW\lib-vc2022;$(SolutionDir)Dependencies\GLEW\lib\Win32</AdditionalLibraryDirectories>
       <AdditionalDependencies>glfw3.lib;opengl32.lib;User32.lib;Gdi32.lib;Shell32.lib;glew32s.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -414,6 +417,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)Dependencies\GLEW\include;$(SolutionDir)Dependencies\GLFW\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/OpenGL1/OpenGL1/include/vendor/imGUI/imgui_impl_glfw_gl3.cpp b/OpenGL1/OpenGL1/include/vendor/imGUI/imgui_impl_glfw_gl3.cpp
@@ -42,12 +42,12 @@
 
 // GLEW/GLFW
 #include <GL/glew.h>   
-#include <GLFW/glfw3.h>
+#include <glfw3.h>
 #ifdef _WIN32
 #undef APIENTRY
 #define GLFW_EXPOSE_NATIVE_WIN32
 #define GLFW_EXPOSE_NATIVE_WGL
-#include <GLFW/glfw3native.h>
+#include <glfw3native.h>
 #endif
 
 // GLFW data

diff --git a/OpenGL1/OpenGL1/source/OGL1/App.cpp b/OpenGL1/OpenGL1/source/OGL1/App.cpp
@@ -1,5 +1,5 @@
 #include <GL/glew.h>
-#include <GLFW/glfw3.h>
+#include <glfw3.h>
 
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>

diff --git a/OpenGL1/x64/Debug/OpenGL1.log b/OpenGL1/x64/Debug/OpenGL1.log
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/CL.command.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/CL.command.1.tlog
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/CL.read.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/CL.read.1.tlog
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/CL.write.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/CL.write.1.tlog
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/OpenGL1.lastbuildstate b/OpenGL1/x64/Debug/OpenGL1.tlog/OpenGL1.lastbuildstate
@@ -0,0 +1,2 @@
+PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.41.34120:TargetPlatformVersion=10.0.22621.0:
+Debug|x64|C:\Users\juang\Desktop\Test\OpenGL-Project-1\|
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link-cvtres.read.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link-cvtres.read.1.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link-cvtres.write.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link-cvtres.write.1.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link-rc.read.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link-rc.read.1.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link-rc.write.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link-rc.write.1.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link.command.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link.command.1.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link.read.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link.read.1.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link.read.2.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link.read.2.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/link.write.1.tlog b/OpenGL1/x64/Debug/OpenGL1.tlog/link.write.1.tlog
@@ -0,0 +1 @@
+��
diff --git a/OpenGL1/x64/Debug/OpenGL1.tlog/unsuccessfulbuild b/OpenGL1/x64/Debug/OpenGL1.tlog/unsuccessfulbuild
diff --git a/OpenGL1/x64/Debug/vc143.idb b/OpenGL1/x64/Debug/vc143.idb
diff --git a/OpenGL1/x64/Debug/vc143.pdb b/OpenGL1/x64/Debug/vc143.pdb
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ @@
     *.lai
     *.la
     *.a
-    *.lib
     # Executables
     *.exe
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.41.34120:TargetPlatformVersion=10.0.22621.0:
		Debug\|x64\|C:\Users\juang\Desktop\Test\OpenGL-Project-1\\|