From ef957b7878e1ea3d477ab35abb49e0f1c767e91a Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Sat, 14 Mar 2015 10:04:30 +0000
Subject: [PATCH] Examples: Moved GLFW/GL3W to a common libs/ folder

---
 examples/{opengl3_example => libs}/gl3w/GL/gl3w.c |   0
 examples/{opengl3_example => libs}/gl3w/GL/gl3w.h |   0
 .../{opengl3_example => libs}/gl3w/GL/glcorearb.h |   0
 .../{opengl_example => libs}/glfw/COPYING.txt     |   0
 .../glfw/include/GLFW/glfw3.h                     |   0
 .../glfw/include/GLFW/glfw3native.h               |   0
 .../glfw/lib-vc2010-32/glfw3.lib                  | Bin
 examples/opengl3_example/opengl3_example.vcxproj  |  14 +++++++-------
 .../opengl3_example.vcxproj.filters               |   6 +++---
 examples/opengl_example/opengl_example.vcxproj    |   8 ++++----
 10 files changed, 14 insertions(+), 14 deletions(-)
 rename examples/{opengl3_example => libs}/gl3w/GL/gl3w.c (100%)
 rename examples/{opengl3_example => libs}/gl3w/GL/gl3w.h (100%)
 rename examples/{opengl3_example => libs}/gl3w/GL/glcorearb.h (100%)
 rename examples/{opengl_example => libs}/glfw/COPYING.txt (100%)
 rename examples/{opengl_example => libs}/glfw/include/GLFW/glfw3.h (100%)
 rename examples/{opengl_example => libs}/glfw/include/GLFW/glfw3native.h (100%)
 rename examples/{opengl_example => libs}/glfw/lib-vc2010-32/glfw3.lib (100%)

diff --git a/examples/opengl3_example/gl3w/GL/gl3w.c b/examples/libs/gl3w/GL/gl3w.c
similarity index 100%
rename from examples/opengl3_example/gl3w/GL/gl3w.c
rename to examples/libs/gl3w/GL/gl3w.c
diff --git a/examples/opengl3_example/gl3w/GL/gl3w.h b/examples/libs/gl3w/GL/gl3w.h
similarity index 100%
rename from examples/opengl3_example/gl3w/GL/gl3w.h
rename to examples/libs/gl3w/GL/gl3w.h
diff --git a/examples/opengl3_example/gl3w/GL/glcorearb.h b/examples/libs/gl3w/GL/glcorearb.h
similarity index 100%
rename from examples/opengl3_example/gl3w/GL/glcorearb.h
rename to examples/libs/gl3w/GL/glcorearb.h
diff --git a/examples/opengl_example/glfw/COPYING.txt b/examples/libs/glfw/COPYING.txt
similarity index 100%
rename from examples/opengl_example/glfw/COPYING.txt
rename to examples/libs/glfw/COPYING.txt
diff --git a/examples/opengl_example/glfw/include/GLFW/glfw3.h b/examples/libs/glfw/include/GLFW/glfw3.h
similarity index 100%
rename from examples/opengl_example/glfw/include/GLFW/glfw3.h
rename to examples/libs/glfw/include/GLFW/glfw3.h
diff --git a/examples/opengl_example/glfw/include/GLFW/glfw3native.h b/examples/libs/glfw/include/GLFW/glfw3native.h
similarity index 100%
rename from examples/opengl_example/glfw/include/GLFW/glfw3native.h
rename to examples/libs/glfw/include/GLFW/glfw3native.h
diff --git a/examples/opengl_example/glfw/lib-vc2010-32/glfw3.lib b/examples/libs/glfw/lib-vc2010-32/glfw3.lib
similarity index 100%
rename from examples/opengl_example/glfw/lib-vc2010-32/glfw3.lib
rename to examples/libs/glfw/lib-vc2010-32/glfw3.lib
diff --git a/examples/opengl3_example/opengl3_example.vcxproj b/examples/opengl3_example/opengl3_example.vcxproj
index 3dd9afdf..936c688d 100644
--- a/examples/opengl3_example/opengl3_example.vcxproj
+++ b/examples/opengl3_example/opengl3_example.vcxproj
@@ -50,11 +50,11 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\opengl_example\glfw\include;gl3w;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\glfw\include;$(SolutionDir)\libs\gl3w;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\opengl_example\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\libs\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>opengl32.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
@@ -66,13 +66,13 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\opengl_example\glfw\include;gl3w;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\glfw\include;$(SolutionDir)\libs\gl3w;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\opengl_example\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\libs\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>opengl32.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <IgnoreSpecificDefaultLibraries>
@@ -81,15 +81,15 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\imgui.cpp" />
-    <ClCompile Include="gl3w\GL\gl3w.c" />
+    <ClCompile Include="..\libs\gl3w\GL\gl3w.c" />
     <ClCompile Include="imgui_impl_glfw_gl3.cpp" />
     <ClCompile Include="main.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\imconfig.h" />
     <ClInclude Include="..\..\imgui.h" />
-    <ClInclude Include="gl3w\GL\gl3w.h" />
-    <ClInclude Include="gl3w\GL\glcorearb.h" />
+    <ClInclude Include="..\libs\gl3w\GL\gl3w.h" />
+    <ClInclude Include="..\libs\gl3w\GL\glcorearb.h" />
     <ClInclude Include="imgui_impl_glfw_gl3.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/examples/opengl3_example/opengl3_example.vcxproj.filters b/examples/opengl3_example/opengl3_example.vcxproj.filters
index 1c00552d..544bd2e7 100644
--- a/examples/opengl3_example/opengl3_example.vcxproj.filters
+++ b/examples/opengl3_example/opengl3_example.vcxproj.filters
@@ -22,7 +22,7 @@
     <ClCompile Include="imgui_impl_glfw_gl3.cpp">
       <Filter>sources</Filter>
     </ClCompile>
-    <ClCompile Include="gl3w\GL\gl3w.c">
+    <ClCompile Include="..\libs\gl3w\GL\gl3w.c">
       <Filter>gl3w</Filter>
     </ClCompile>
   </ItemGroup>
@@ -36,10 +36,10 @@
     <ClInclude Include="imgui_impl_glfw_gl3.h">
       <Filter>sources</Filter>
     </ClInclude>
-    <ClInclude Include="gl3w\GL\gl3w.h">
+    <ClInclude Include="..\libs\gl3w\GL\gl3w.h">
       <Filter>gl3w</Filter>
     </ClInclude>
-    <ClInclude Include="gl3w\GL\glcorearb.h">
+    <ClInclude Include="..\libs\gl3w\GL\glcorearb.h">
       <Filter>gl3w</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/examples/opengl_example/opengl_example.vcxproj b/examples/opengl_example/opengl_example.vcxproj
index c92d0acc..1d4dbc55 100644
--- a/examples/opengl_example/opengl_example.vcxproj
+++ b/examples/opengl_example/opengl_example.vcxproj
@@ -50,11 +50,11 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\glfw\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\glfw\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\libs\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>opengl32.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
@@ -66,13 +66,13 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\glfw\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\glfw\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ProjectDir)\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)\libs\glfw\lib-vc2010-32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>opengl32.lib;glfw3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <IgnoreSpecificDefaultLibraries>