diff --git a/Makefile b/Makefile
index 2d0ffc4..c9c82a3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ OBJ = obj
 BIN = bin
 
 CFLAGS = -Wall
+CXXFLAGS = -std=c++17
 LDFLAGS =
 
 ifneq ($(RELEASE),1)
@@ -29,7 +30,7 @@ include libvgm.mak
 
 $(OBJ)/%.o: $(SRC)/%.cpp
 	@mkdir -p $(@D)
-	$(CXX) $(CFLAGS) -MMD -c $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) -MMD -c $< -o $@
 
 #======================================================================
 
diff --git a/imgui.mak b/imgui.mak
index 3afd53f..d73b8af 100644
--- a/imgui.mak
+++ b/imgui.mak
@@ -23,7 +23,7 @@ endif
 ifeq ($(UNAME_S), Darwin) #APPLE
 	ECHO_MESSAGE = "Mac OS X"
 	LDFLAGS_IMGUI += -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo
-	LDFLAGS_IMGUI += -L/usr/local/lib -L/opt/local/lib
+	LDFLAGS_IMGUI += -L/usr/local/lib
 	#LDFLAGS_IMGUI += -lglfw3
 	LDFLAGS_IMGUI += -lglfw
 
@@ -52,11 +52,11 @@ IMGUI_CTE_OBJS = \
 
 $(IMGUI_CTE_OBJ)/%.o: $(IMGUI_CTE_SRC)/%.cpp
 	@mkdir -p $(@D)
-	$(CXX) $(CFLAGS) -MMD -c $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) -MMD -c $< -o $@
 
 $(IMGUI_OBJ)/%.o: $(IMGUI_SRC)/%.cpp
 	@mkdir -p $(@D)
-	$(CXX) $(CFLAGS) -MMD -c $< -o $@
+	$(CXX) $(CFLAGS) $(CXXFLAGS) -MMD -c $< -o $@
 
 $(IMGUI_OBJ)/%.o: $(IMGUI_SRC)/%.c
 	@mkdir -p $(@D)
diff --git a/libvgm.mak b/libvgm.mak
index 07bde3f..ce64de8 100644
--- a/libvgm.mak
+++ b/libvgm.mak
@@ -7,6 +7,6 @@ CFLAGS += -DAUDDRV_WINMM -DAUDDRV_DSOUND -DAUDDRV_XAUD2
 LDFLAGS_LIBVGM += -Wl,-Bstatic -lvgm-audio -lvgm-emu -lvgm-utils -Wl,-Bdynamic
 LDFLAGS_LIBVGM += -ldsound -luuid -lwinmm -lole32
 else
-CFLAGS += `pkg-config --with-path=/usr/local/lib/pkgconfig --cflags vgm-audio`
-LDFLAGS_LIBVGM += -Wl,-rpath,/usr/local/lib `pkg-config --with-path=/usr/local/lib/pkgconfig --libs vgm-audio vgm-emu`
+CFLAGS += `pkg-config --cflags vgm-audio`
+LDFLAGS_LIBVGM += -Wl,-rpath,/usr/local/lib `pkg-config --libs vgm-audio vgm-emu ao` -framework AudioToolbox
 endif