From 1742ca45c5aace614be83b237af2f014b4c2d90d Mon Sep 17 00:00:00 2001 From: Rokas Kupstys Date: Tue, 26 Nov 2019 11:24:01 +0200 Subject: [PATCH] CI: Add unity builds test. (#2893) --- .github/workflows/build.yml | 9 +++++++++ examples/example_null/Makefile | 11 ++++++++--- examples/example_null/unity_build.cpp | 6 ++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 examples/example_null/unity_build.cpp diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60f8f6428..8b0b09fa9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,9 @@ jobs: - name: Build example_null (extra warnings) run: mingw32-make -C examples/example_null EXTRA_WARNINGS=1 + - name: Build example_null (unity build) + run: mingw32-make -C examples/example_null UNITY_BUILD=1 + - name: Build Win32 example_glfw_opengl2 shell: cmd run: '"%MSBUILD_PATH%\MSBuild.exe" examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj /p:Platform=Win32 /p:Configuration=Release' @@ -156,6 +159,9 @@ jobs: - name: Build example_null (extra warnings) run: make -C examples/example_null EXTRA_WARNINGS=1 + - name: Build example_null (unity build) + run: make -C examples/example_null UNITY_BUILD=1 + - name: Build example_glfw_opengl2 run: make -C examples/example_glfw_opengl2 @@ -185,6 +191,9 @@ jobs: - name: Build example_null (extra warnings) run: make -C examples/example_null EXTRA_WARNINGS=1 + - name: Build example_null (unity build) + run: make -C examples/example_null UNITY_BUILD=1 + - name: Build example_glfw_opengl2 run: make -C examples/example_glfw_opengl2 diff --git a/examples/example_null/Makefile b/examples/example_null/Makefile index 909f19820..16802cbaa 100644 --- a/examples/example_null/Makefile +++ b/examples/example_null/Makefile @@ -4,11 +4,16 @@ # EXE = example_null -SOURCES = main.cpp -SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp ../../imgui_widgets.cpp +EXTRA_WARNINGS ?= 0 +UNITY_BUILD ?= 0 +ifeq ($(UNITY_BUILD), 1) + SOURCES = unity_build.cpp +else + SOURCES = main.cpp + SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp ../../imgui_widgets.cpp +endif OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES)))) UNAME_S := $(shell uname -s) -EXTRA_WARNINGS ?= 0 CXXFLAGS = -I../ -I../../ CXXFLAGS += -g -Wall -Wformat diff --git a/examples/example_null/unity_build.cpp b/examples/example_null/unity_build.cpp new file mode 100644 index 000000000..c60400161 --- /dev/null +++ b/examples/example_null/unity_build.cpp @@ -0,0 +1,6 @@ +// Unity build test - build this example as a single compilation unit. +#include "main.cpp" +#include "../../imgui.cpp" +#include "../../imgui_demo.cpp" +#include "../../imgui_draw.cpp" +#include "../../imgui_widgets.cpp"