File tree 2 files changed +11
-9
lines changed
2 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -71,6 +71,7 @@ lib/tbb
71
71
72
72
# local make include
73
73
/make /local
74
+ /make /ucrt
74
75
75
76
# python byte code
76
77
* .pyc
Original file line number Diff line number Diff line change @@ -121,15 +121,6 @@ CXXFLAGS_LANG ?= -std=c++1y
121
121
CXXFLAGS_SUNDIALS ?= -pipe $(CXXFLAGS_OPTIM_SUNDIALS) $(CPPFLAGS_FLTO_SUNDIALS)
122
122
#CXXFLAGS_GTEST
123
123
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)
133
124
134
125
## These are the other compiler flags that can be set.
135
126
##
@@ -170,6 +161,16 @@ ifeq ($(OS),Windows_NT)
170
161
CXXFLAGS_OS ?= -m64
171
162
endif
172
163
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
+
173
174
include make/ucrt
174
175
ifeq ($(IS_UCRT),true)
175
176
CXXFLAGS_OS += -D_UCRT
You can’t perform that action at this time.
0 commit comments