Skip to content

Commit 441415f

Browse files
committed
Move ucrt rule, add to gitignore
1 parent 9ee98c9 commit 441415f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ lib/tbb
7171

7272
# local make include
7373
/make/local
74+
/make/ucrt
7475

7576
# python byte code
7677
*.pyc

make/compiler_flags

+10-9
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,6 @@ CXXFLAGS_LANG ?= -std=c++1y
121121
CXXFLAGS_SUNDIALS ?= -pipe $(CXXFLAGS_OPTIM_SUNDIALS) $(CPPFLAGS_FLTO_SUNDIALS)
122122
#CXXFLAGS_GTEST
123123

124-
make/ucrt:
125-
pound := \#
126-
UCRT_STRING := $(shell echo '$(pound)include <windows.h>' | $(CXX) -E -dM - | findstr _UCRT)
127-
ifneq (,$(UCRT_STRING))
128-
IS_UCRT ?= true
129-
else
130-
IS_UCRT ?= false
131-
endif
132-
$(shell echo "IS_UCRT ?= $(IS_UCRT)" > $(MATH)make/ucrt)
133124

134125
## These are the other compiler flags that can be set.
135126
##
@@ -170,6 +161,16 @@ ifeq ($(OS),Windows_NT)
170161
CXXFLAGS_OS ?= -m64
171162
endif
172163

164+
make/ucrt:
165+
pound := \#
166+
UCRT_STRING := $(shell echo '$(pound)include <windows.h>' | $(CXX) -E -dM - | findstr _UCRT)
167+
ifneq (,$(UCRT_STRING))
168+
IS_UCRT ?= true
169+
else
170+
IS_UCRT ?= false
171+
endif
172+
$(shell echo "IS_UCRT ?= $(IS_UCRT)" > $(MATH)make/ucrt)
173+
173174
include make/ucrt
174175
ifeq ($(IS_UCRT),true)
175176
CXXFLAGS_OS += -D_UCRT

0 commit comments

Comments
 (0)