Skip to content

Commit 8d39063

Browse files
ocornutocornut
committedFeb 15, 2022
CI: Fixes for OSX + explicitely request C++11.
·
v1.91.9v1.88
1 parent b6b8f66 commit 8d39063

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed
 

Diff for: ‎.github/workflows/build.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
#include "examples/example_null/main.cpp"
247247
248248
EOF
249-
g++ -I. -Wall -Wformat -Wextra -Werror -Wno-zero-as-null-pointer-constant -Wno-double-promotion -Wno-variadic-macros -Wno-empty-body -o example_single_file example_single_file.cpp
249+
g++ -I. -std=c++11 -Wall -Wformat -Wextra -Werror -Wno-zero-as-null-pointer-constant -Wno-double-promotion -Wno-variadic-macros -Wno-empty-body -o example_single_file example_single_file.cpp
250250
251251
- name: Build example_null (freetype)
252252
run: |
@@ -262,7 +262,7 @@ jobs:
262262
#include "examples/example_null/main.cpp"
263263
264264
EOF
265-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
265+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
266266
267267
- name: Build example_null (with ImWchar32)
268268
run: |
@@ -274,7 +274,7 @@ jobs:
274274
#include "examples/example_null/main.cpp"
275275
276276
EOF
277-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
277+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
278278
279279
- name: Build example_null (with large ImDrawIdx + pointer ImTextureID)
280280
run: |
@@ -287,7 +287,7 @@ jobs:
287287
#include "examples/example_null/main.cpp"
288288
289289
EOF
290-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
290+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
291291
292292
- name: Build example_null (with IMGUI_DISABLE_OBSOLETE_FUNCTIONS)
293293
run: |
@@ -299,7 +299,7 @@ jobs:
299299
#include "examples/example_null/main.cpp"
300300
301301
EOF
302-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
302+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
303303
304304
- name: Build example_null (with IMGUI_DISABLE_OBSOLETE_KEYIO)
305305
run: |
@@ -311,7 +311,7 @@ jobs:
311311
#include "examples/example_null/main.cpp"
312312
313313
EOF
314-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
314+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
315315
316316
- name: Build example_null (with IMGUI_DISABLE_DEMO_WINDOWS and IMGUI_DISABLE_METRICS_WINDOW)
317317
run: |
@@ -324,7 +324,7 @@ jobs:
324324
#include "examples/example_null/main.cpp"
325325
326326
EOF
327-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
327+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
328328
329329
- name: Build example_null (with IMGUI_DISABLE_FILE_FUNCTIONS)
330330
run: |
@@ -336,7 +336,7 @@ jobs:
336336
#include "examples/example_null/main.cpp"
337337
338338
EOF
339-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
339+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
340340
341341
- name: Build example_null (with IMGUI_USE_BGRA_PACKED_COLOR)
342342
run: |
@@ -348,7 +348,7 @@ jobs:
348348
#include "examples/example_null/main.cpp"
349349
350350
EOF
351-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
351+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
352352
353353
- name: Build example_null (with IM_VEC2_CLASS_EXTRA and IM_VEC4_CLASS_EXTRA)
354354
run: |
@@ -368,7 +368,7 @@ jobs:
368368
#include "examples/example_null/main.cpp"
369369
370370
EOF
371-
g++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
371+
g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
372372
373373
- name: Build example_null (without c++ runtime, Clang)
374374
run: |
@@ -380,7 +380,7 @@ jobs:
380380
#include "examples/example_null/main.cpp"
381381
382382
EOF
383-
clang++ -I. -Wall -Wformat -nodefaultlibs -fno-rtti -fno-exceptions -fno-threadsafe-statics -lc -lm -o example_single_file example_single_file.cpp
383+
clang++ -I. -std=c++11 -Wall -Wformat -nodefaultlibs -fno-rtti -fno-exceptions -fno-threadsafe-statics -lc -lm -o example_single_file example_single_file.cpp
384384
385385
- name: Build example_glfw_opengl2
386386
run: make -C examples/example_glfw_opengl2
@@ -397,7 +397,7 @@ jobs:
397397
run: make -C examples/example_sdl_opengl3
398398

399399
- name: Build with IMGUI_IMPL_VULKAN_NO_PROTOTYPES
400-
run: g++ -c -I. -DIMGUI_IMPL_VULKAN_NO_PROTOTYPES=1 backends/imgui_impl_vulkan.cpp
400+
run: g++ -c -I. -std=c++11 -DIMGUI_IMPL_VULKAN_NO_PROTOTYPES=1 backends/imgui_impl_vulkan.cpp
401401

402402
MacOS:
403403
runs-on: macos-latest
@@ -420,7 +420,7 @@ jobs:
420420
#include "examples/example_null/main.cpp"
421421
422422
EOF
423-
clang++ -I. -Wall -Wformat -o example_single_file example_single_file.cpp
423+
clang++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
424424
425425
- name: Build example_null (without c++ runtime)
426426
run: |
@@ -431,7 +431,7 @@ jobs:
431431
#include "examples/example_null/main.cpp"
432432
433433
EOF
434-
clang++ -I. -Wall -Wformat -nodefaultlibs -fno-rtti -fno-exceptions -fno-threadsafe-statics -lc -lm -o example_single_file example_single_file.cpp
434+
clang++ -I. -std=c++11 -Wall -Wformat -nodefaultlibs -fno-rtti -fno-exceptions -fno-threadsafe-statics -lc -lm -o example_single_file example_single_file.cpp
435435
436436
- name: Build example_glfw_opengl2
437437
run: make -C examples/example_glfw_opengl2

Diff for: ‎examples/example_glfw_metal/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LIBS = -framework Metal -framework MetalKit -framework Cocoa -framework IOKit -f
1717
LIBS += -L/usr/local/lib -L/opt/homebrew/lib
1818
LIBS += -lglfw
1919

20-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends -I/usr/local/include -I/opt/homebrew/include
20+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends -I/usr/local/include -I/opt/homebrew/include
2121
CXXFLAGS += -Wall -Wformat
2222
CFLAGS = $(CXXFLAGS)
2323

Diff for: ‎examples/example_glfw_opengl2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SOURCES += $(IMGUI_DIR)/backends/imgui_impl_glfw.cpp $(IMGUI_DIR)/backends/imgui
2222
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)
2424

25-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
25+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
2626
CXXFLAGS += -g -Wall -Wformat
2727
LIBS =
2828

Diff for: ‎examples/example_glfw_opengl3/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)
2424
LINUX_GL_LIBS = -lGL
2525

26-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
26+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
2727
CXXFLAGS += -g -Wall -Wformat
2828
LIBS =
2929

Diff for: ‎examples/example_glut_opengl2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SOURCES += $(IMGUI_DIR)/backends/imgui_impl_glut.cpp $(IMGUI_DIR)/backends/imgui
1717
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
1818
UNAME_S := $(shell uname -s)
1919

20-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
20+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
2121
CXXFLAGS += -g -Wall -Wformat
2222
LIBS =
2323

Diff for: ‎examples/example_null/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui
1717
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
1818
UNAME_S := $(shell uname -s)
1919

20-
CXXFLAGS += -I$(IMGUI_DIR)
20+
CXXFLAGS += -std=c++11 -I$(IMGUI_DIR)
2121
CXXFLAGS += -g -Wall -Wformat
2222
LIBS =
2323

@@ -52,7 +52,7 @@ endif
5252
ifeq ($(UNAME_S), Darwin) #APPLE
5353
ECHO_MESSAGE = "Mac OS X"
5454
ifeq ($(WITH_EXTRA_WARNINGS), 1)
55-
CXXFLAGS += -Weverything -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-padded -Wno-c++11-long-long -Wno-poison-system-directories
55+
CXXFLAGS += -Weverything -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-padded -Wno-poison-system-directories
5656
endif
5757
CFLAGS = $(CXXFLAGS)
5858
endif

Diff for: ‎examples/example_sdl_metal/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LIBS = -framework Metal -framework MetalKit -framework Cocoa -framework IOKit -f
1717
LIBS += `sdl2-config --libs`
1818
LIBS += -L/usr/local/lib
1919

20-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends -I/usr/local/include
20+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends -I/usr/local/include
2121
CXXFLAGS += `sdl2-config --cflags`
2222
CXXFLAGS += -Wall -Wformat
2323
CFLAGS = $(CXXFLAGS)

Diff for: ‎examples/example_sdl_opengl2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SOURCES += $(IMGUI_DIR)/backends/imgui_impl_sdl.cpp $(IMGUI_DIR)/backends/imgui_
2222
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)
2424

25-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
25+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
2626
CXXFLAGS += -g -Wall -Wformat
2727
LIBS =
2828

Diff for: ‎examples/example_sdl_opengl3/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)
2424
LINUX_GL_LIBS = -lGL
2525

26-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
26+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
2727
CXXFLAGS += -g -Wall -Wformat
2828
LIBS =
2929

Diff for: ‎examples/example_sdl_sdlrenderer/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SOURCES += $(IMGUI_DIR)/backends/imgui_impl_sdl.cpp $(IMGUI_DIR)/backends/imgui_
2222
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)
2424

25-
CXXFLAGS = -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
25+
CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
2626
CXXFLAGS += -g -Wall -Wformat
2727
LIBS =
2828

0 commit comments

Comments
 (0)
Please sign in to comment.