Skip to content

Commit

Permalink
Updated submodule and cinderblock.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@simongeilfus
simongeilfus committed Aug 24, 2015
1 parent 6b6f945 commit 2a5110e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
9 changes: 9 additions & 0 deletions cinderblock.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,22 @@
>
<supports os="msw" />
<supports os="macosx" />

<includePath>lib</includePath>
<includePath>include</includePath>

<header>include/CinderImGui.h</header>
<header>include/imgui_user.h</header>
<header>include/imgui_user.inl</header>

<header>lib/imgui/imconfig.h</header>
<header>lib/imgui/imgui.h</header>
<header>lib/imgui/imgui_internal.h</header>

<source>src/CinderImGui.cpp</source>
<source>lib/imgui/imgui.cpp</source>
<source>lib/imgui/imgui_draw.cpp</source>
<source>lib/imgui/imgui_demo.cpp</source>

</block>
</cinder>
2 changes: 1 addition & 1 deletion lib/imgui
Submodule imgui updated 37 files
+0 −1 .gitignore
+14 −9 README.md
+4 −4 examples/README.txt
+2 −2 examples/allegro5_example/README.md
+6 −7 examples/allegro5_example/imgui_impl_a5.h
+3 −0 examples/directx11_example/directx11_example.vcxproj
+9 −0 examples/directx11_example/directx11_example.vcxproj.filters
+33 −30 examples/directx11_example/imgui_impl_dx11.cpp
+6 −6 examples/directx11_example/imgui_impl_dx11.h
+3 −0 examples/directx9_example/directx9_example.vcxproj
+9 −0 examples/directx9_example/directx9_example.vcxproj.filters
+36 −31 examples/directx9_example/imgui_impl_dx9.cpp
+6 −6 examples/directx9_example/imgui_impl_dx9.h
+8 −0 examples/ios_example/imguiex.xcodeproj/project.pbxproj
+3 −3 examples/opengl3_example/Makefile
+2 −2 examples/opengl3_example/imgui_impl_glfw_gl3.cpp
+9 −9 examples/opengl3_example/imgui_impl_glfw_gl3.h
+3 −0 examples/opengl3_example/opengl3_example.vcxproj
+9 −0 examples/opengl3_example/opengl3_example.vcxproj.filters
+3 −3 examples/opengl_example/Makefile
+2 −2 examples/opengl_example/imgui_impl_glfw.cpp
+9 −9 examples/opengl_example/imgui_impl_glfw.h
+3 −0 examples/opengl_example/opengl_example.vcxproj
+9 −0 examples/opengl_example/opengl_example.vcxproj.filters
+10 −3 examples/sdl_opengl_example/README.md
+1 −1 examples/sdl_opengl_example/imgui_impl_sdl.cpp
+6 −6 examples/sdl_opengl_example/imgui_impl_sdl.h
+3 −0 examples/sdl_opengl_example/main.cpp
+71 −57 extra_fonts/README.txt
+54 −20 extra_fonts/binary_to_compressed_c.cpp
+1 −1 imconfig.h
+1,294 −5,814 imgui.cpp
+87 −71 imgui.h
+2,135 −0 imgui_demo.cpp
+2,111 −0 imgui_draw.cpp
+669 −0 imgui_internal.h
+192 −106 stb_truetype.h
12 changes: 12 additions & 0 deletions samples/Basic/xcode/Basic.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; };
00B9955A1B128DF400A5C623 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B995581B128DF400A5C623 /* IOKit.framework */; };
00B9955B1B128DF400A5C623 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B995591B128DF400A5C623 /* IOSurface.framework */; };
4B02AFBF1B8B5EC2004AF2E2 /* imgui_draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B02AFBD1B8B5EC2004AF2E2 /* imgui_draw.cpp */; };
4B02AFC11B8B5ED8004AF2E2 /* imgui_demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B02AFC01B8B5ED8004AF2E2 /* imgui_demo.cpp */; };
5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; };
5E6E94684FA44CA38C481B49 /* imgui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE937C7594E4CE19F18B442 /* imgui.cpp */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
Expand All @@ -42,6 +44,10 @@
34D47A91AC4741568117ADF1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
40DE7C313FA244EEA86CB0A6 /* imgui_user.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = imgui_user.h; path = ../../../include/imgui_user.h; sourceTree = "<group>"; };
42C59536675A423CAFB03803 /* CinderImGui.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CinderImGui.h; path = ../../../include/CinderImGui.h; sourceTree = "<group>"; };
4B02AFBC1B8B5EC2004AF2E2 /* imconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imconfig.h; path = ../../../lib/imgui/imconfig.h; sourceTree = "<group>"; };
4B02AFBD1B8B5EC2004AF2E2 /* imgui_draw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imgui_draw.cpp; path = ../../../lib/imgui/imgui_draw.cpp; sourceTree = "<group>"; };
4B02AFBE1B8B5EC2004AF2E2 /* imgui_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imgui_internal.h; path = ../../../lib/imgui/imgui_internal.h; sourceTree = "<group>"; };
4B02AFC01B8B5ED8004AF2E2 /* imgui_demo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imgui_demo.cpp; path = ../../../lib/imgui/imgui_demo.cpp; sourceTree = "<group>"; };
5323E6B10EAFCA74003A9687 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = "<absolute>"; };
8D1107320486CEB800E47090 /* Basic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Basic.app; sourceTree = BUILT_PRODUCTS_DIR; };
9049B03296B24B548A212B19 /* imgui.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = imgui.h; path = ../../../lib/imgui/imgui.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -188,6 +194,10 @@
children = (
9049B03296B24B548A212B19 /* imgui.h */,
DFE937C7594E4CE19F18B442 /* imgui.cpp */,
4B02AFBC1B8B5EC2004AF2E2 /* imconfig.h */,
4B02AFBD1B8B5EC2004AF2E2 /* imgui_draw.cpp */,
4B02AFBE1B8B5EC2004AF2E2 /* imgui_internal.h */,
4B02AFC01B8B5ED8004AF2E2 /* imgui_demo.cpp */,
);
name = imgui;
sourceTree = "<group>";
Expand Down Expand Up @@ -276,6 +286,8 @@
E41A11BB015747548BA6ADF4 /* BasicApp.cpp in Sources */,
F1D30F1318B749EBAC4F39B2 /* CinderImGui.cpp in Sources */,
5E6E94684FA44CA38C481B49 /* imgui.cpp in Sources */,
4B02AFC11B8B5ED8004AF2E2 /* imgui_demo.cpp in Sources */,
4B02AFBF1B8B5EC2004AF2E2 /* imgui_draw.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down

0 comments on commit 2a5110e

Please sign in to comment.