From 52a74701f51a4b3d75cadbf7066bb6ecde3df007 Mon Sep 17 00:00:00 2001 From: ocornut Date: Tue, 21 Jul 2015 17:04:03 -0600 Subject: [PATCH] Updated projects to reference new files (#219) Didn't update iOS example (#247) --- README.md | 4 +++- examples/directx11_example/directx11_example.vcxproj | 3 +++ .../directx11_example/directx11_example.vcxproj.filters | 9 +++++++++ examples/directx9_example/directx9_example.vcxproj | 3 +++ .../directx9_example/directx9_example.vcxproj.filters | 9 +++++++++ examples/opengl3_example/Makefile | 2 +- examples/opengl3_example/opengl3_example.vcxproj | 3 +++ examples/opengl3_example/opengl3_example.vcxproj.filters | 9 +++++++++ examples/opengl_example/Makefile | 2 +- examples/opengl_example/opengl_example.vcxproj | 3 +++ examples/opengl_example/opengl_example.vcxproj.filters | 9 +++++++++ 11 files changed, 53 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 583fe1804..f79b343b5 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,11 @@ ImGui is designed to enable fast iteration and allow programmers to create "cont ImGui is particularly suited to integration in realtime 3D applications, fullscreen applications, embedded applications, games, or any applications on consoles platforms where operating system features are non-standard. pa -ImGui is self-contained within 6 files that you can easily copy and compile into your application/engine: +ImGui is self-contained within a few files that you can easily copy and compile into your application/engine: - imgui.cpp + - imgui_demo.cpp + - imgui_draw.cpp - imgui.h - imconfig.h (empty by default, user-editable) - stb_rect_pack.h diff --git a/examples/directx11_example/directx11_example.vcxproj b/examples/directx11_example/directx11_example.vcxproj index 0ad66c4f1..d3dcd0ea0 100644 --- a/examples/directx11_example/directx11_example.vcxproj +++ b/examples/directx11_example/directx11_example.vcxproj @@ -140,10 +140,13 @@ + + + diff --git a/examples/directx11_example/directx11_example.vcxproj.filters b/examples/directx11_example/directx11_example.vcxproj.filters index fca4dcfd5..ac905dd3e 100644 --- a/examples/directx11_example/directx11_example.vcxproj.filters +++ b/examples/directx11_example/directx11_example.vcxproj.filters @@ -18,6 +18,9 @@ sources + + imgui + @@ -29,5 +32,11 @@ sources + + imgui + + + imgui + \ No newline at end of file diff --git a/examples/directx9_example/directx9_example.vcxproj b/examples/directx9_example/directx9_example.vcxproj index beaf53eac..737bddb6e 100644 --- a/examples/directx9_example/directx9_example.vcxproj +++ b/examples/directx9_example/directx9_example.vcxproj @@ -139,12 +139,15 @@ + + + diff --git a/examples/directx9_example/directx9_example.vcxproj.filters b/examples/directx9_example/directx9_example.vcxproj.filters index 13e1f412e..4952cebc3 100644 --- a/examples/directx9_example/directx9_example.vcxproj.filters +++ b/examples/directx9_example/directx9_example.vcxproj.filters @@ -19,6 +19,12 @@ sources + + imgui + + + imgui + @@ -30,5 +36,8 @@ sources + + imgui + \ No newline at end of file diff --git a/examples/opengl3_example/Makefile b/examples/opengl3_example/Makefile index cc7ec31e4..ec8c57f28 100644 --- a/examples/opengl3_example/Makefile +++ b/examples/opengl3_example/Makefile @@ -11,7 +11,7 @@ #CXX = g++ OBJS = main.o imgui_impl_glfw_gl3.o -OBJS += ../../imgui.o +OBJS += ../../imgui.o ../../imgui_demo.o ../../imgui_draw.o OBJS += ../libs/gl3w/GL/gl3w.o UNAME_S := $(shell uname -s) diff --git a/examples/opengl3_example/opengl3_example.vcxproj b/examples/opengl3_example/opengl3_example.vcxproj index 202c5f734..e935ec2be 100644 --- a/examples/opengl3_example/opengl3_example.vcxproj +++ b/examples/opengl3_example/opengl3_example.vcxproj @@ -149,6 +149,8 @@ + + @@ -156,6 +158,7 @@ + diff --git a/examples/opengl3_example/opengl3_example.vcxproj.filters b/examples/opengl3_example/opengl3_example.vcxproj.filters index 544bd2e75..d3539e7ff 100644 --- a/examples/opengl3_example/opengl3_example.vcxproj.filters +++ b/examples/opengl3_example/opengl3_example.vcxproj.filters @@ -25,6 +25,12 @@ gl3w + + imgui + + + imgui + @@ -42,5 +48,8 @@ gl3w + + imgui + \ No newline at end of file diff --git a/examples/opengl_example/Makefile b/examples/opengl_example/Makefile index 966e93386..570fa1acd 100644 --- a/examples/opengl_example/Makefile +++ b/examples/opengl_example/Makefile @@ -11,7 +11,7 @@ #CXX = g++ OBJS = main.o imgui_impl_glfw.o -OBJS += ../../imgui.o +OBJS += ../../imgui.o ../../imgui_demo.o ../../imgui_draw.o UNAME_S := $(shell uname -s) diff --git a/examples/opengl_example/opengl_example.vcxproj b/examples/opengl_example/opengl_example.vcxproj index 718fedc56..6d6ac6b76 100644 --- a/examples/opengl_example/opengl_example.vcxproj +++ b/examples/opengl_example/opengl_example.vcxproj @@ -149,12 +149,15 @@ + + + diff --git a/examples/opengl_example/opengl_example.vcxproj.filters b/examples/opengl_example/opengl_example.vcxproj.filters index 1365a7dab..a6b5f8210 100644 --- a/examples/opengl_example/opengl_example.vcxproj.filters +++ b/examples/opengl_example/opengl_example.vcxproj.filters @@ -19,6 +19,12 @@ sources + + imgui + + + imgui + @@ -30,5 +36,8 @@ sources + + imgui + \ No newline at end of file