From 5ae71aa04a530a7444349654917bd1bdb3ac3b85 Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 25 Aug 2016 10:25:51 +0200 Subject: [PATCH] Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) --- examples/.gitignore | 10 +++++----- examples/imgui_examples_msvc2010.sln | 2 +- examples/opengl2_example/build_win32.bat | 2 +- ...{opengl_example.vcxproj => opengl2_example.vcxproj} | 2 +- ...vcxproj.filters => opengl2_example.vcxproj.filters} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename examples/opengl2_example/{opengl_example.vcxproj => opengl2_example.vcxproj} (99%) rename examples/opengl2_example/{opengl_example.vcxproj.filters => opengl2_example.vcxproj.filters} (100%) diff --git a/examples/.gitignore b/examples/.gitignore index 41704453..54d15398 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -15,11 +15,11 @@ directx11_example/Debug/* directx11_example/Release/* directx11_example/ipch/* directx11_example/x64/* -opengl_example/Debug/* -opengl_example/Release/* -opengl_example/ipch/* -opengl_example/x64/* -opengl_example/opengl_example +opengl2_example/Debug/* +opengl2_example/Release/* +opengl2_example/ipch/* +opengl2_example/x64/* +opengl2_example/opengl_example opengl3_example/Debug/* opengl3_example/Release/* opengl3_example/ipch/* diff --git a/examples/imgui_examples_msvc2010.sln b/examples/imgui_examples_msvc2010.sln index 16f0d60b..8c1cd2a3 100644 --- a/examples/imgui_examples_msvc2010.sln +++ b/examples/imgui_examples_msvc2010.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl2_example", "opengl_example\opengl2_example.vcxproj", "{9CDA7840-B7A5-496D-A527-E95571496D18}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl2_example", "opengl2_example\opengl2_example.vcxproj", "{9CDA7840-B7A5-496D-A527-E95571496D18}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directx9_example", "directx9_example\directx9_example.vcxproj", "{4165A294-21F2-44CA-9B38-E3F935ABADF5}" EndProject diff --git a/examples/opengl2_example/build_win32.bat b/examples/opengl2_example/build_win32.bat index 278381c7..28e6752f 100644 --- a/examples/opengl2_example/build_win32.bat +++ b/examples/opengl2_example/build_win32.bat @@ -1,3 +1,3 @@ @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler. mkdir Debug -cl /nologo /Zi /MD /I ..\.. /I ..\libs\glfw\include *.cpp ..\..\*.cpp /FeDebug/opengl_example.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib +cl /nologo /Zi /MD /I ..\.. /I ..\libs\glfw\include *.cpp ..\..\*.cpp /FeDebug/opengl2_example.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib diff --git a/examples/opengl2_example/opengl_example.vcxproj b/examples/opengl2_example/opengl2_example.vcxproj similarity index 99% rename from examples/opengl2_example/opengl_example.vcxproj rename to examples/opengl2_example/opengl2_example.vcxproj index 4b354b6f..bea2104d 100644 --- a/examples/opengl2_example/opengl_example.vcxproj +++ b/examples/opengl2_example/opengl2_example.vcxproj @@ -20,7 +20,7 @@ {9CDA7840-B7A5-496D-A527-E95571496D18} - opengl_example + opengl2_example diff --git a/examples/opengl2_example/opengl_example.vcxproj.filters b/examples/opengl2_example/opengl2_example.vcxproj.filters similarity index 100% rename from examples/opengl2_example/opengl_example.vcxproj.filters rename to examples/opengl2_example/opengl2_example.vcxproj.filters