2
0
Эх сурвалжийг харах

Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.

omar 7 жил өмнө
parent
commit
ba99900023

+ 1 - 1
examples/opengl2_example/Makefile

@@ -11,7 +11,7 @@
 #CXX = g++
 #CXX = g++
 
 
 EXE = opengl2_example
 EXE = opengl2_example
-OBJS = main.o imgui_impl_glfw.o
+OBJS = main.o imgui_impl_glfw_gl2.o
 OBJS += ../../imgui.o ../../imgui_demo.o ../../imgui_draw.o
 OBJS += ../../imgui.o ../../imgui_demo.o ../../imgui_draw.o
 
 
 UNAME_S := $(shell uname -s)
 UNAME_S := $(shell uname -s)

+ 1 - 1
examples/opengl2_example/imgui_impl_glfw.cpp → examples/opengl2_example/imgui_impl_glfw_gl2.cpp

@@ -16,7 +16,7 @@
 // https://github.com/ocornut/imgui
 // https://github.com/ocornut/imgui
 
 
 #include <imgui.h>
 #include <imgui.h>
-#include "imgui_impl_glfw.h"
+#include "imgui_impl_glfw_gl2.h"
 
 
 // GLFW
 // GLFW
 #include <GLFW/glfw3.h>
 #include <GLFW/glfw3.h>

+ 0 - 0
examples/opengl2_example/imgui_impl_glfw.h → examples/opengl2_example/imgui_impl_glfw_gl2.h


+ 1 - 1
examples/opengl2_example/main.cpp

@@ -7,7 +7,7 @@
 // See imgui_impl_glfw.cpp for details.
 // See imgui_impl_glfw.cpp for details.
 
 
 #include <imgui.h>
 #include <imgui.h>
-#include "imgui_impl_glfw.h"
+#include "imgui_impl_glfw_gl2.h"
 #include <stdio.h>
 #include <stdio.h>
 #include <GLFW/glfw3.h>
 #include <GLFW/glfw3.h>
 
 

+ 2 - 2
examples/opengl2_example/opengl2_example.vcxproj

@@ -153,14 +153,14 @@
     <ClCompile Include="..\..\imgui.cpp" />
     <ClCompile Include="..\..\imgui.cpp" />
     <ClCompile Include="..\..\imgui_demo.cpp" />
     <ClCompile Include="..\..\imgui_demo.cpp" />
     <ClCompile Include="..\..\imgui_draw.cpp" />
     <ClCompile Include="..\..\imgui_draw.cpp" />
-    <ClCompile Include="imgui_impl_glfw.cpp" />
+    <ClCompile Include="imgui_impl_glfw_gl2.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="main.cpp" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\imconfig.h" />
     <ClInclude Include="..\..\imconfig.h" />
     <ClInclude Include="..\..\imgui.h" />
     <ClInclude Include="..\..\imgui.h" />
     <ClInclude Include="..\..\imgui_internal.h" />
     <ClInclude Include="..\..\imgui_internal.h" />
-    <ClInclude Include="imgui_impl_glfw.h" />
+    <ClInclude Include="imgui_impl_glfw_gl2.h" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <None Include="..\README.txt" />
     <None Include="..\README.txt" />

+ 2 - 2
examples/opengl2_example/opengl2_example.vcxproj.filters

@@ -16,7 +16,7 @@
     <ClCompile Include="..\..\imgui.cpp">
     <ClCompile Include="..\..\imgui.cpp">
       <Filter>imgui</Filter>
       <Filter>imgui</Filter>
     </ClCompile>
     </ClCompile>
-    <ClCompile Include="imgui_impl_glfw.cpp">
+    <ClCompile Include="imgui_impl_glfw_gl2.cpp">
       <Filter>sources</Filter>
       <Filter>sources</Filter>
     </ClCompile>
     </ClCompile>
     <ClCompile Include="..\..\imgui_demo.cpp">
     <ClCompile Include="..\..\imgui_demo.cpp">
@@ -33,7 +33,7 @@
     <ClInclude Include="..\..\imgui.h">
     <ClInclude Include="..\..\imgui.h">
       <Filter>imgui</Filter>
       <Filter>imgui</Filter>
     </ClInclude>
     </ClInclude>
-    <ClInclude Include="imgui_impl_glfw.h">
+    <ClInclude Include="imgui_impl_glfw_gl2.h">
       <Filter>sources</Filter>
       <Filter>sources</Filter>
     </ClInclude>
     </ClInclude>
     <ClInclude Include="..\..\imgui_internal.h">
     <ClInclude Include="..\..\imgui_internal.h">