Index: makefile
===================================================================
--- makefile	(revision 826df16ad0027a920254943793adf36c48239d7f)
+++ makefile	(revision b6127d23cf6cc5e4760bb05b426570b2f3bc6366)
@@ -2,5 +2,5 @@
 OS = $(shell uname)
 CC = g++
-CFLAGS = -std=c++11 -Wall -pedantic -rdynamic
+CFLAGS = -std=c++17 -Wall -pedantic -rdynamic
 # -rdynamic is to generate debug info for dynamic symbols on debian-based 
 # systems (tested on Linux Mint)
@@ -34,14 +34,28 @@
 	$(CC) $^ $(DEP) $(CFLAGS) -o $@
 
-# from the mac makefile
-#CXX_INCLUDES = -I/Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS/include -I/usr/local/Cellar/sdl2/2.0.9_1/include/SDL2
-#LIBFLAGS =  -Wl,-rpath,$(VULKAN_SDK_PATH)/macOS/lib $(VULKAN_SDK_PATH)/macOS/lib/libvulkan.dylib -L/usr/local/Cellar/sdl2/2.0.9_1/lib -lSDL2
+CXX_FLAGS = -std=c++17 -Wall -pedantic # -O3 -rdynamic
 
-CXX_FLAGS = -std=c++17 -Wall -pedantic # -O3
+ifeq ($(OS),Darwin)
+	VULKAN_SDK_PATH = /Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS
+endif
+ifeq ($(OS),Linux)
+	VULKAN_SDK_PATH = /home/dportnoy/Desktop/VulkanSDK/1.1.106.0/x86_64
+endif
 
-VULKAN_SDK_PATH = /home/dportnoy/Desktop/VulkanSDK/1.1.106.0/x86_64
+LIB_PATHS =  -I$(VULKAN_SDK_PATH)/include
+ifeq ($(OS),Darwin)
+	LIB_PATHS := -Wl,-rpath,$(VULKAN_SDK_PATH)/lib $(LIB_PATHS)
+endif
+ifeq ($(OS),Linux)
+	LIB_PATHS := -L$(VULKAN_SDK_PATH)/lib $(LIB_PATHS)
+endif
 
-LIB_PATHS = -L$(VULKAN_SDK_PATH)/lib -I$(VULKAN_SDK_PATH)/include
-LIBS = -lvulkan -lSDL2
+LIBS = -lSDL2
+ifeq ($(OS),Darwin)
+	LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
+endif
+ifeq ($(OS),Linux)
+	LIBS := -lvulkan $(LIBS)
+endif
 
 LIB_FLAGS = $(LIB_PATHS) $(LIBS)