From 5ebd61f89ca3b86e18fa46a4d2915671b9db5662 Mon Sep 17 00:00:00 2001 From: ocornut Date: Fri, 28 Aug 2015 15:55:22 +0100 Subject: [PATCH 1/2] Ignore list a little more friendly to Unix systems --- examples/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/.gitignore b/examples/.gitignore index 6dee4d634..0c970a052 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -23,6 +23,7 @@ opengl3_example/x64/* *.sdf *.suo *.vcxproj.user +*.o ## Ini files imgui.ini From da807e55eaccf62bc618dd4f9a1ccd2833d5bca3 Mon Sep 17 00:00:00 2001 From: ocornut Date: Fri, 28 Aug 2015 16:03:05 +0100 Subject: [PATCH 2/2] Examples: Ignore list a little more friendly to Unix systems. --- examples/.gitignore | 2 ++ examples/opengl3_example/Makefile | 9 +++++---- examples/opengl_example/Makefile | 9 +++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/.gitignore b/examples/.gitignore index 0c970a052..27a250a6d 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -15,10 +15,12 @@ opengl_example/Debug/* opengl_example/Release/* opengl_example/ipch/* opengl_example/x64/* +opengl_example/opengl_example opengl3_example/Debug/* opengl3_example/Release/* opengl3_example/ipch/* opengl3_example/x64/* +opengl3_example/opengl3_example *.opensdf *.sdf *.suo diff --git a/examples/opengl3_example/Makefile b/examples/opengl3_example/Makefile index 748fd4dc9..7d8fcbbce 100644 --- a/examples/opengl3_example/Makefile +++ b/examples/opengl3_example/Makefile @@ -10,6 +10,7 @@ #CXX = g++ +EXE = opengl3_example OBJS = main.o imgui_impl_glfw_gl3.o OBJS += ../../imgui.o ../../imgui_demo.o ../../imgui_draw.o OBJS += ../libs/gl3w/GL/gl3w.o @@ -41,12 +42,12 @@ endif .cpp.o: $(CXX) $(CXXFLAGS) -c -o $@ $< -all:imgui_example +all: $(EXE) @echo Build complete for $(ECHO_MESSAGE) -imgui_example:$(OBJS) - $(CXX) -o imgui_example $(OBJS) $(CXXFLAGS) $(LIBS) +$(EXE): $(OBJS) + $(CXX) -o $(EXE) $(OBJS) $(CXXFLAGS) $(LIBS) clean: - rm $(OBJS) + rm $(EXE) $(OBJS) diff --git a/examples/opengl_example/Makefile b/examples/opengl_example/Makefile index d05a0f90f..7986229fc 100644 --- a/examples/opengl_example/Makefile +++ b/examples/opengl_example/Makefile @@ -10,6 +10,7 @@ #CXX = g++ +EXE = opengl_example OBJS = main.o imgui_impl_glfw.o OBJS += ../../imgui.o ../../imgui_demo.o ../../imgui_draw.o @@ -40,12 +41,12 @@ endif .cpp.o: $(CXX) $(CXXFLAGS) -c -o $@ $< -all:imgui_example +all: $(EXE) @echo Build complete for $(ECHO_MESSAGE) -imgui_example:$(OBJS) - $(CXX) -o imgui_example $(OBJS) $(CXXFLAGS) $(LIBS) +$(EXE): $(OBJS) + $(CXX) -o $(EXE) $(OBJS) $(CXXFLAGS) $(LIBS) clean: - rm $(OBJS) + rm $(EXE) $(OBJS)