mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Examples: Apple: Amend build scripts and gitignore, fix misc OSX warnings. (#8637)

Browse source 
# Conflicts:
#	backends/imgui_impl_metal.mm
This commit is contained in:
ocornut 2025-05-14 18:05:23 +02:00
parent 2df9e9b103
commit b5a73033ab
5 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -32,9 +32,10 @@ JSON/
## Commonly used CMake directories ## Commonly used CMake directories
build*/ build*/
## Xcode artifacts ## Xcode & macOS artifacts
project.xcworkspace project.xcworkspace
xcuserdata xcuserdata
examples/*/*.dSYM
## Emscripten artifacts ## Emscripten artifacts
examples/*.o.tmp examples/*.o.tmp
@ -54,6 +55,7 @@ cmake-build-*
## Unix executables from our example Makefiles ## Unix executables from our example Makefiles
examples/example_apple_metal/example_apple_metal examples/example_apple_metal/example_apple_metal
examples/example_apple_opengl2/example_apple_opengl2
examples/example_glfw_metal/example_glfw_metal examples/example_glfw_metal/example_glfw_metal
examples/example_glfw_opengl2/example_glfw_opengl2 examples/example_glfw_opengl2/example_glfw_opengl2
examples/example_glfw_opengl3/example_glfw_opengl3 examples/example_glfw_opengl3/example_glfw_opengl3

2
backends/imgui_impl_osx.mm
View file

@ -477,7 +477,7 @@ bool ImGui_ImplOSX_Init(NSView* view)
[view addSubview:bd->KeyEventResponder]; [view addSubview:bd->KeyEventResponder];
ImGui_ImplOSX_AddTrackingArea(view); ImGui_ImplOSX_AddTrackingArea(view);
platform_io.Platform_SetImeDataFn = [](ImGuiContext*, ImGuiViewport* viewport, ImGuiPlatformImeData* data) -> void platform_io.Platform_SetImeDataFn = [](ImGuiContext*, ImGuiViewport*, ImGuiPlatformImeData* data) -> void
{ {
ImGui_ImplOSX_Data* bd = ImGui_ImplOSX_GetBackendData(); ImGui_ImplOSX_Data* bd = ImGui_ImplOSX_GetBackendData();
if (data->WantVisible) if (data->WantVisible)

1
docs/CHANGELOG.txt
View file

@ -130,6 +130,7 @@ Other changes:
- Backends: Vulkan: fixed validation errors in window create/resize helpers used by examples - Backends: Vulkan: fixed validation errors in window create/resize helpers used by examples
and by multi-viewports implementation, which would typically trigger errors while detaching and by multi-viewports implementation, which would typically trigger errors while detaching
secondary viewports. (#8600, #8176) [@ChrisTom-94] secondary viewports. (#8600, #8176) [@ChrisTom-94]
- Examples: Apple+Metal, Apple+OpenGL: add Makefile (CLion opens them nicely). (#8637) [@pthom]
- Examples: DirectX12+Win32: also test for IsIconic() for sleeping since we don't seem to - Examples: DirectX12+Win32: also test for IsIconic() for sleeping since we don't seem to
get a DXGI_STATUS_OCCLUDED signal when minimized. (#8603) [@dooann] get a DXGI_STATUS_OCCLUDED signal when minimized. (#8603) [@dooann]

28
examples/example_apple_metal/Makefile
View file

@ -1,25 +1,21 @@
# Makefile for example_apple_metal, for macOS only (**not iOS**) # Makefile for example_apple_metal, for macOS only (**not iOS**)
TARGET := example_apple_metal CXX = clang++
CXX := clang++ EXE = example_apple_metal
CXXFLAGS := -std=c++17 -ObjC++ -fobjc-arc -Wall -Wextra \ IMGUI_DIR = ../../
-I../../ \ SOURCES = main.mm
-I../../backends SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
FRAMEWORKS := -framework AppKit -framework Metal -framework MetalKit -framework QuartzCore -framework GameController SOURCES += $(IMGUI_DIR)/backends/imgui_impl_osx.mm $(IMGUI_DIR)/backends/imgui_impl_metal.mm
IMGUI_SRC := ../../imgui.cpp ../../imgui_draw.cpp ../../imgui_demo.cpp \
../../imgui_tables.cpp ../../imgui_widgets.cpp
BACKENDS := ../../backends/imgui_impl_metal.mm ../../backends/imgui_impl_osx.mm
SRC := main.mm $(IMGUI_SRC) $(BACKENDS)
.PHONY: all run clean CXXFLAGS = -std=c++11 -ObjC++ -fobjc-arc -Wall -Wextra -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
FRAMEWORKS = -framework AppKit -framework Metal -framework MetalKit -framework QuartzCore -framework GameController
all: $(EXE)
all: $(TARGET) $(EXE): $(SOURCES)
$(TARGET): $(SRC)
$(CXX) $(CXXFLAGS) $^ $(FRAMEWORKS) -o $@ $(CXX) $(CXXFLAGS) $^ $(FRAMEWORKS) -o $@
run: all run: all
./$(TARGET) ./$(EXE)
clean: clean:
rm -f $(TARGET) *.o rm -f $(EXE) *.o

32
examples/example_apple_opengl2/Makefile
View file

@ -1,25 +1,21 @@
IMGUI_DIR = ../../ # Makefile for example_apple_metal, for macOS only (**not iOS**)
CXX = clang++ CXX = clang++
CXXFLAGS = -std=c++17 -ObjC++ -Wall -Wextra -g -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends EXE = example_apple_opengl2
IMGUI_DIR = ../../
SOURCES = main.mm
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_osx.mm $(IMGUI_DIR)/backends/imgui_impl_opengl2.cpp
CXXFLAGS = -std=c++11 -ObjC++ -fobjc-arc -Wall -Wextra -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
FRAMEWORKS = -framework Cocoa -framework OpenGL -framework GameController FRAMEWORKS = -framework Cocoa -framework OpenGL -framework GameController
SOURCES = \ all: $(EXE)
main.mm \
$(IMGUI_DIR)/backends/imgui_impl_osx.mm \
$(IMGUI_DIR)/backends/imgui_impl_opengl2.cpp \
$(IMGUI_DIR)/imgui.cpp \
$(IMGUI_DIR)/imgui_draw.cpp \
$(IMGUI_DIR)/imgui_demo.cpp \
$(IMGUI_DIR)/imgui_tables.cpp \
$(IMGUI_DIR)/imgui_widgets.cpp
TARGET = imgui_example_apple_opengl2 $(EXE): $(SOURCES)
$(CXX) $(CXXFLAGS) $(SOURCES) -o $(EXE) $(FRAMEWORKS)
all: $(TARGET) run: all
./$(EXE)
$(TARGET): $(SOURCES)
$(CXX) $(CXXFLAGS) $(SOURCES) -o imgui_example_apple_opengl2 $(FRAMEWORKS)
clean: clean:
rm -f $(TARGET) rm -f $(EXE) *.o
rm -rf $(TARGET).dSYM