Fixing compilation issues on MacOS with g++

gtDMMB · Jun 2, 2021 · 2900382 · 2900382
1 parent 109c444
commit 2900382
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build-scripts/BuildTargetInfo.h.in b/build-scripts/BuildTargetInfo.h.in
@@ -87,7 +87,7 @@
 #define __STRUCTVIZ_INSTALL_SIGSEGV_HANDLER     1
 #define __STRUCTVIZ_INSTALL_CTRLC_HANDLER       1
 
-#define RNASTRUCTVIZ_VSTRING         ("🧬  RNAStructViz  v2.4.123-stable -- RNA Secondary Structure Comparison Multi-Tool")
+#define RNASTRUCTVIZ_VSTRING         ("🧬  RNAStructViz  v2.4.14-stable -- RNA Secondary Structure Comparison Multi-Tool")
 
 #define HUGE_BUFFER_LINE_SIZE        (2048)
 

diff --git a/src/Makefile b/src/Makefile
@@ -18,7 +18,7 @@ ifeq "$(TARGET_PLATFORM)" "Darwin"
 	FLTKCONFIG=/usr/local/opt/fltkwithcairo/bin/fltk-config
 	READLINK=$(shell which greadlink)
 	DEBUGGER=$(shell which lldb)
-	CXXFLAGS+= -std=c++1z -Wno-c++11-narrowing -I/usr/local/opt/openssl/include
+	CXXFLAGS+= -std=c++17 -Wno-c++11-narrowing -I/usr/local/opt/openssl/include
 	LDFLAGS+= -L/usr/local/opt/openssl/lib
 	## fallback values since Mac is broken as a platform w.r.t. its make version:
 	#DEBUG=$(shell ../build-scripts/get-build-config-setting.sh \
@@ -34,7 +34,7 @@ else
 	FLTKCONFIG=$(shell which fltk-config)
 	READLINK=$(shell which readlink)
 	DEBUGGER=$(shell which gdb)
-	CXXFLAGS+= -std=gnu++1z -I/usr/include
+	CXXFLAGS+= -std=c++17 -I/usr/include
 	LDFLAGS+= -Wl,--no-as-needed
 endif