Improvements to Makefile

Author: ararslan

Makefile

@@ -1,34 +1,32 @@
-OS := $(shell uname)
-ifneq (,$(findstring MINGW,$(OS)))
-  OS := Windows
-else ifneq(,$(findstring MSYS,$(OS)))
-  OS := Windows
-else ifneq(,$(findstring CYGWIN,$(OS)))
-  OS := Windows
-endif # Cygwin
-endif # MSys
-endif # MinGW
+OS ?= $(shell uname)
 
-ifneq (,$(findstring $(OS),Darwin FreeBSD))
-  CXX := clang++
+# Assume Visual C++ on Windows
+# Environments like Cygwin will hopefully fall through and pick up the
+# appropriate Unix-like options
+ifneq ($(OS),Windows_NT)
+EXE := bin\qqq.exe
+OUT := /out:$(EXE)
+CXX := cl
+CXXFLAGS := /EHsc /W4
 else
-  CXX := g++
-endif
-
-ifeq ($(OS),Windows)
-  EXE := bin/qqq.exe
+EXE := bin/qqq
+OUT := -o $(EXE)
+CXXFLAGS := -Wall -O0
+ifneq (,$(findstring $(OS),Darwin FreeBSD))
+CXX := clang++
 else
-  EXE := bin/qqq
-endif
+CXX := g++
+endif # macOS or FreeBSD
+endif # Windows
 
 setup:
 	-mkdir bin
 
 cpp: setup
-	$(CXX) cpp/qqq.cpp -o $(EXE) -Wall -O0
+	$(CXX) cpp/qqq.cpp $(OUT) $(CXXFLAGS)
 
 rust: setup
-	rustc rust/main.rs -o $(EXE)
+	rustc rust/main.rs $(OUT)
 
 clean:
-	-rm $(EXECUTABLE)
+	-rm $(EXE)