diff --git a/.gitignore b/.gitignore
index 87e54c2..e8ec6e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
+build/
+.DS_Store
+CMakeCache.txt
+CMakeFiles/
+*.cmake
 main
-*.o
+Makefile
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..50e7aec
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "portaudio"]
+	path = lib/portaudio
+	url = https://github.com/PortAudio/portaudio
+[submodule "lib/portmidi"]
+	path = lib/portmidi
+	url = https://github.com/PortMidi/portmidi
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..eca7c9e
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.26)
+project(synth)
+
+set(CMAKE_CXX_STANDARD 11)
+
+add_subdirectory(lib/portaudio)
+add_subdirectory(lib/portmidi)
+add_executable(main main.cpp oscillator.cpp)
+target_link_libraries(main PRIVATE PortAudio)
+target_link_libraries(main PRIVATE portmidi)
+target_include_directories(main PUBLIC lib/portmidi/porttime)
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f6c0963..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CPPFLAGS=-std=c++11 -Ofast
-LDLIBS=-lstdc++ -lportaudio -lportmidi
-
-all: main
-
-clean :
-	rm -f main *.o
-
-main : main.o oscillator.o
-
-main.o: svf.h
-
-oscillator.o: oscillator.h
\ No newline at end of file
diff --git a/lib/portaudio b/lib/portaudio
new file mode 160000
index 0000000..c8b9dd2
--- /dev/null
+++ b/lib/portaudio
@@ -0,0 +1 @@
+Subproject commit c8b9dd2dfc1c12230f172876a0117f42d32e48b2
diff --git a/lib/portmidi b/lib/portmidi
new file mode 160000
index 0000000..99e1ea7
--- /dev/null
+++ b/lib/portmidi
@@ -0,0 +1 @@
+Subproject commit 99e1ea79c5e364730cb1c95fbb05bdd98b5afeaa