Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-05 04:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Browse Source 
Conflicts:
	imgui.cpp
This commit is contained in:
ocornut
2015-07-10 21:45:25 -06:00
parent 398ef1a212 b67593a4b1
commit fd44b9440b
7 changed files with 73 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/allegro5_example/README.md
View File

@ -14,5 +14,3 @@ g++ -I ../imgui main.cpp imgui_impl_a5.cpp ../imgui/imgui.cpp -lallegro -lallegr
```
cl /MD /I <a5path\include> /I ..\imgui main.cpp imgui_impl_a5.cpp ..\imgui\imgui.cpp /link /LIBPATH:<a5path\lib> allegro-5.0.10-monolith-md.lib user32.lib
```
public domain

2
examples/allegro5_example/imgui_impl_a5.cpp
View File

@ -1,6 +1,6 @@
// ImGui Allegro 5 bindings
// https://github.com/ocornut/imgui
// by @birthggd, public domain
// by @birthggd
#include <stdint.h> // uint64_t
#include <cstring> // memcpy

2
examples/allegro5_example/imgui_impl_a5.h
View File

@ -1,6 +1,6 @@
// ImGui Allegro 5 bindings
// https://github.com/ocornut/imgui
// by @birthggd, public domain
// by @birthggd
#pragma once

1
examples/allegro5_example/main.cpp
View File

@ -1,5 +1,4 @@
// ImGui - standalone example application for Allegro 5
// public domain
#include <stdint.h>
#include <allegro5/allegro.h>