Skip to content

Commit 2c77e40

Browse files
committed
Apply Windows cmark fallback before CPPFLAGS
1 parent 7ca511e commit 2c77e40

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

ObjcMarkdown/GNUmakefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ CMARK_LIBS := $(shell pkg-config --libs $(CMARK_PKG) 2>/dev/null)
88
CMARK_MANAGED_INCLUDE_WIN := $(if $(GP_GNUSTEP_CLI_ROOT),$(subst \,/,$(GP_GNUSTEP_CLI_ROOT))/clang64/include)
99
CMARK_MANAGED_INCLUDE := $(shell if [ -n "$$GP_GNUSTEP_CLI_ROOT" ]; then root="$$(cygpath -u "$$GP_GNUSTEP_CLI_ROOT" 2>/dev/null)"; if [ -n "$$root" ]; then printf '%s/clang64/include' "$$root"; fi; fi)
1010
OBJCMARKDOWN_ENABLE_TOML_THEME ?= 1
11-
12-
ObjcMarkdown_OBJC_FILES = OMMarkdownRenderer.m OMTheme.m OMMarkdownParsingOptions.m
13-
ObjcMarkdown_HEADER_FILES = OMMarkdownRenderer.h OMTheme.h OMMarkdownParsingOptions.h
14-
ObjcMarkdown_CPPFLAGS += $(CMARK_CFLAGS) -DOBJCMARKDOWN_ENABLE_TOML_THEME=$(OBJCMARKDOWN_ENABLE_TOML_THEME)
1511
ifneq (,$(findstring mingw,$(GNUSTEP_HOST_OS)))
1612
ObjcMarkdown_OBJCFLAGS += -include sys/types.h "-Dmode_t=unsigned short"
1713
ObjcMarkdown_LIBRARIES_DEPEND_UPON += -lgdiplus
@@ -23,6 +19,10 @@ CMARK_CFLAGS := -I/clang64/include
2319
endif
2420
endif
2521
endif
22+
23+
ObjcMarkdown_OBJC_FILES = OMMarkdownRenderer.m OMTheme.m OMMarkdownParsingOptions.m
24+
ObjcMarkdown_HEADER_FILES = OMMarkdownRenderer.h OMTheme.h OMMarkdownParsingOptions.h
25+
ObjcMarkdown_CPPFLAGS += $(CMARK_CFLAGS) -DOBJCMARKDOWN_ENABLE_TOML_THEME=$(OBJCMARKDOWN_ENABLE_TOML_THEME)
2626
ifeq ($(OBJCMARKDOWN_ENABLE_TOML_THEME),1)
2727
ObjcMarkdown_C_FILES = ../third_party/tomlc99/toml.c
2828
ObjcMarkdown_CPPFLAGS += -I../third_party/tomlc99

0 commit comments

Comments
 (0)