From 2f43c47e771ebb73b1369159f8affb7d4eeb07d7 Mon Sep 17 00:00:00 2001 From: ValKmjolnir Date: Wed, 10 Aug 2022 19:48:01 +0800 Subject: [PATCH] :bug: fix compilation error of modules on macOS platform --- makefile | 10 ++++++---- module/makefile | 15 +++++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/makefile b/makefile index 9633f76..1cd36ba 100644 --- a/makefile +++ b/makefile @@ -15,15 +15,17 @@ SRC=\ nasal_dbg.h\ nasal.h +CPPSTANDARD=-std=c++11 + nasal:$(SRC) - $(CXX) -std=c++11 -O3 main.cpp -o nasal -fno-exceptions -ldl -Wshadow -Wall + $(CXX) $(CPPSTANDARD) -O3 main.cpp -o nasal -fno-exceptions -ldl -Wshadow -Wall nasal.exe:$(SRC) - $(CXX) -std=c++11 -O3 main.cpp -o nasal.exe -fno-exceptions -Wshadow -Wall -static + $(CXX) $(CPPSTANDARD) -O3 main.cpp -o nasal.exe -fno-exceptions -Wshadow -Wall -static stable-release:$(SRC) - $(CXX) -std=c++11 -O2 main.cpp -o nasal -fno-exceptions -ldl -Wshadow -Wall + $(CXX) $(CPPSTANDARD) -O2 main.cpp -o nasal -fno-exceptions -ldl -Wshadow -Wall stable-release-mingw:$(SRC) - $(CXX) -std=c++11 -O2 main.cpp -o nasal.exe -fno-exceptions -Wshadow -Wall -static + $(CXX) $(CPPSTANDARD) -O2 main.cpp -o nasal.exe -fno-exceptions -Wshadow -Wall -static test:nasal @ ./nasal -op -e test/ascii-art.nas diff --git a/module/makefile b/module/makefile index a2778d4..f8b1dd7 100644 --- a/module/makefile +++ b/module/makefile @@ -1,28 +1,31 @@ .PHONY=clean all mingw-all + +CPPSTANDARD=-std=c++11 + libfib.so: fib.cpp - $(CXX) -c -O3 fib.cpp -fPIC -o fib.o + $(CXX) $(CPPSTANDARD) -c -O3 fib.cpp -fPIC -o fib.o $(CXX) -shared -o libfib.so fib.o rm fib.o libfib.dll: fib.cpp - $(CXX) -c -O3 fib.cpp -fPIC -o fib.o + $(CXX) $(CPPSTANDARD) -c -O3 fib.cpp -fPIC -o fib.o $(CXX) -shared -o libfib.dll fib.o del fib.o libkey.so: keyboard.cpp - $(CXX) -c -O3 keyboard.cpp -fPIC -o keyboard.o + $(CXX) $(CPPSTANDARD) -c -O3 keyboard.cpp -fPIC -o keyboard.o $(CXX) -shared -o libkey.so keyboard.o rm keyboard.o libkey.dll: keyboard.cpp - $(CXX) -c -O3 keyboard.cpp -fPIC -o keyboard.o -static + $(CXX) $(CPPSTANDARD) -c -O3 keyboard.cpp -fPIC -o keyboard.o -static $(CXX) -shared -o libkey.dll keyboard.o -static del keyboard.o libnasock.so: nasocket.cpp - $(CXX) -c -O3 nasocket.cpp -fPIC -o nasocket.o + $(CXX) $(CPPSTANDARD) -c -O3 nasocket.cpp -fPIC -o nasocket.o $(CXX) -shared -o libnasock.so nasocket.o rm nasocket.o libnasock.dll: nasocket.cpp - $(CXX) -c -O3 nasocket.cpp -fPIC -o nasocket.o -lwsock32 -static + $(CXX) $(CPPSTANDARD) -c -O3 nasocket.cpp -fPIC -o nasocket.o -lwsock32 -static $(CXX) -shared -o libnasock.dll nasocket.o -lwsock32 -static del nasocket.o