diff --git a/.clang-format b/.clang-format index dedc805..c5a4cae 100644 --- a/.clang-format +++ b/.clang-format @@ -99,10 +99,6 @@ IncludeIsMainSourceRegex: '' IncludeIsMainRegex: '([-_](test|unittest))?$' IncludeBlocks: Regroup IncludeCategories: - - Regex: '^' - Priority: 1 - SortPriority: 0 - CaseSensitive: true - Regex: '^<.*\.h>' Priority: 2 SortPriority: 0 diff --git a/Makefile b/Makefile index c249bb1..ea73c4e 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ CMAKE ?= cmake -G 'Unix Makefiles' CPPFLAGS ?= CFLAGS ?= -O2 -Wall -Wextra -Wpedantic -Wno-pointer-arith LDFLAGS ?= -flto +CPPFLAGS += -DGLFW_INCLUDE_NONE CFLAGS += -std=gnu99 # add a few extra flags depending on whether