Browse code

no longer needed to specify CXX_STD = CXX14

ramon diaz-uriarte (at Phelsuma) authored on 20/02/2023 19:00:22
Showing 2 changed files

... ...
@@ -6,10 +6,11 @@ CXX11=g++$(VER)
6 6
 
7 7
 ## This is a C++11 package
8 8
 ## but using C++14 leads to faster INSTALL. In my machine:
9
+## C++14 is default starting from R-4.1.0
9 10
 ## C++11: 6'30"
10 11
 ## C++14: 4'20"
11 12
 ## C++17: 5'08"
12
-CXX_STD = CXX14
13
+## CXX_STD = CXX14
13 14
 
14 15
 
15 16
 all: liblandscape.a fl_statistics fl_generate $(SHLIB)
... ...
@@ -4,7 +4,8 @@ CC=gcc$(VER)
4 4
 CXX=g++$(VER)
5 5
 CXX11=g++$(VER)
6 6
 
7
-CXX_STD = CXX14
7
+
8
+## CXX_STD = CXX14
8 9
 
9 10
 MYCXXFLAGS = -Wa,-mbig-obj
10 11