diff --git a/.gitignore b/.gitignore
index e8ef78d..e65ec5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,7 @@
 .DS_Store
 *.dSYM
 /.vs/
-/packages/
 /saves/
-*.o
-/sm
-/build/
+/build*/
 /sm.smc
-SDL2.dll
-/sm.exe
-/glsl-shaders/
\ No newline at end of file
+/glsl-shaders/
diff --git a/BUILDING.md b/BUILDING.md
index e40b009..0c07992 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1,55 +1,41 @@
 # Requirements
-  * A Super Metroid rom (Make sure to rename it to `sm.smc`)
+  * cmake (and also ninja, for better compiling speed)
+  * A Super Metroid rom (Make sure to rename it to `sm.smc`) which **must be in
+    the same folder as `sm`/`sm.exe`**
   * libsdl2-dev
   * Super Metroid repo `git clone --recursive https://github.com/snesrev/sm`
   
  For Linux/MacOS you must install these for your desired OS:
- * Ubuntu/Debian: `sudo apt install libsdl2-dev`
- * Fedora Linux: `sudo dnf in sdl2-devel`
- * Arch Linux: `sudo pacman -S sdl2`
- * macOS: `brew install sdl2`
+ * Ubuntu/Debian: `sudo apt install libsdl2-dev cmake ninja-build`
+ * Fedora Linux: `sudo dnf in sdl2-devel cmake ninja-build`
+ * Arch Linux: `sudo pacman -S sdl2 cmake ninja`
+ * macOS: `brew install sdl2 cmake ninja`
 
 # Windows
 
 ## Building with MSYS2
-
-Dependencies and requirements:
-
-  * The `libsdl2-dev` library
-  * [MSYS2](https://www.msys2.org)
+First, install [MSYS2](https://www.msys2.org/). After following the instructions,
+install the following packages.
   
 Note: *Make sure you're using MINGW64 and you're in `sm` folder in the terminal.*
 
-1. Install MSYS2 on your machine.
-2. Place the copy of your rom in the main directory.
-3. Install the necessary dependencies by inputting this command in the terminal.
-
-```sh
-pacman -S mingw-w64-x86_64-SDL2 && pacman -S make && pacman -S mingw-w64-x86_64-gcc
-```
-4. Type `sdl2-config --cflags`, it should output:
-```sh
--IC:/msys64/mingw64/include/SDL2 -Dmain=SDL_main
-```
-5. After that type `sdl2-config --libs`, should output:
 ```sh
--LC:/msys64/mingw64/lib -lmingw32 -mwindows -lSDL2main -lSDL2
+pacman -S mingw-w64-x86_64-{gcc,cmake,SDL2,ninja}
 ```
 
-After you've done installing everything, cd to `sm` folder. Type `make`
-In order to speed up the compilation, type `make -j16`
-
 ## Building with Visual Studio
 
 Dependencies and requirements:
  * The `libsdl2-dev` library, which is automatically installed with NuGet.
  * [Visual Studio Community 2022](https://visualstudio.microsoft.com)
 
-Download VS installer. On installer prompt, make sure you're on "Workloads" and check `Desktop Development with C++` this will install the necessary deps for compilation.
+Download VS installer. On installer prompt, make sure you're on "Workloads" 
+and check **both** `Desktop Development with C++` **and** `C++ CMake Tools for Windows`.
+This will install the necessary deps for compilation.
 
-1. Open `sm.sln` solution.
-2. Change the build target from `Debug` to `Release`
-3. Build the solution.
+Visual Studio should automatically detect the CMake project and let you configure and build it. If not,
+follow the [general instructions](https://learn.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-170)
+from Microsoft.
 
 ## Building with Tiny C Compiler
 
@@ -64,34 +50,34 @@ Download VS installer. On installer prompt, make sure you're on "Workloads" and
 
 CD to your SM root folder and open the terminal and type:
 ```sh
-make
+cmake -B build && cmake --build build --parallel
 ```
 
-For more advanced usage:
-```sh
-make -j$(nproc) # run on all core
-make clean all  # clear gen+obj and rebuild
-CC=clang make   # specify compiler
-```
+The resulting binary will be `build/sm`.
 
 # Nintendo Switch
 
-Dependencies and requirements:
+## Getting Dependencies
 
-  * The `switch-sdl2` library
+You will need:
   * [DevKitPro](https://github.com/devkitPro/installer)
   * [Atmosphere](https://github.com/Atmosphere-NX/Atmosphere)
   
-1. Make sure you've installed Atmosphere on your Switch.
-2. Please download the DevKitPro version of MSYS2 through their installer, as the default MSYS2 causes issues with windows compiling.
-3. Now that you've installed DevKitPro, open up the location you've installed DevKitPro to, then find `mingw64.exe` inside `msys2` located in `devkitPro` folder.
-4. Type `pacman -S git switch-dev switch-sdl2 switch-tools` in the terminal to install the `switch-sdl2` library.
-5. CD to `switch` folder by typing `cd src/platfrom/switch` in the terminal on the `sm` root folder.
-6. type `make` to compile the Switch Port.
-7. Transfer the `.ini`, `nro`, `ncap` and your rom file to the Switch.
+First, follow the [installation instructions on devkitPro's website](https://devkitpro.org/wiki/Getting_Started).
 
-**OPTIONAL STEP**
+Second, once you have pacman set up and synced, do:
+```shell
+pacman -S switch-dev switch-tools switch-sdl2
+```
 
-```sh
-make -j$(nproc) # To build using all cores
+## Building
+In the top level directory, you can use the cmake preset for running a build for the switch:
+```shell
+cmake --preset nintendo-switch
+cmake --build build-switch --parallel
 ```
+
+## Getting SM on to your Switch
+First, make sure you've installed [Atmosphere](https://github.com/Atmosphere-NX/Atmosphere) on your Switch.
+Next, go into the `build-switch` directory and copy `sm.ini`, `sm.nro`, and `sm.ncap` and the sm rom
+file to your Switch.
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..595b04a
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
+
+project(sm
+        VERSION 0.0.1
+        DESCRIPTION "Super Metroid PC Port"
+        HOMEPAGE_URL "https://github.com/snesrev/sm"
+        LANGUAGES C)
+
+if (CMAKE_BINARY_DIR EQUAL CMAKE_SOURCE_DIR)
+    message(WARNING "You are compiling in the source tree, you probably don't want to do that. Use -B to set the build directory")
+endif()
+
+include(GNUInstallDirs)
+
+# For installation later
+set(ini_name "${PROJECT_SOURCE_DIR}/sm.ini")
+
+# Dependencies
+# ------------
+# SDL
+if (WIN32 OR NINTENDO_SWITCH)
+    # Force static on Windows and Switch, just because it's easier
+    find_package(SDL2 REQUIRED COMPONENTS SDL2-static)
+else()
+    find_package(SDL2 REQUIRED COMPONENTS SDL2)
+endif()
+
+# OpenGL
+# TODO: This should likely be removed
+add_library(gl STATIC "third_party/gl_core/gl_core_3_1.c")
+target_include_directories(gl PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+
+# Main Executable
+# ---------------
+add_executable(sm)
+add_subdirectory(src)
+target_link_libraries(sm PRIVATE m SDL2::SDL2 gl)
+target_compile_definitions(sm PRIVATE SYSTEM_VOLUME_MIXER_AVAILABLE=0)
+
+# Nintendo Switch extra setup
+if (NINTENDO_SWITCH)
+    enable_language(CXX)
+    nx_generate_nacp(sm.nacp
+                     NAME "Super Metroid"
+                     AUTHOR "snesrev & Lywx"
+                     VERSION "${PROJECT_VERSION}")
+    
+    nx_create_nro(sm
+                  NACP sm.nacp
+                  ICON "${PROJECT_SOURCE_DIR}/src/platform/switch/icon.jpg")
+
+    set(ini_name "${PROJECT_SOURCE_DIR}/src/platform/switch/sm.ini")
+endif()
+
+# Installation
+# ------------
+install(TARGETS sm RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+
+# TODO: should be in some config dir
+install(FILES "${ini_name}" DESTINATION "${CMAKE_INSTALL_BINDIR}")
\ No newline at end of file
diff --git a/CMakePresets.json b/CMakePresets.json
new file mode 100644
index 0000000..97da501
--- /dev/null
+++ b/CMakePresets.json
@@ -0,0 +1,20 @@
+{
+    "version": 3,
+    "cmakeMinimumRequired": {
+      "major": 3,
+      "minor": 21,
+      "patch": 0
+    },
+    "configurePresets": [
+        {
+          "name": "nintendo-switch",
+          "binaryDir": "${sourceDir}/build-switch",
+          "toolchainFile": "$env{DEVKITPRO}/cmake/Switch.cmake",
+          "condition": {
+            "type": "notEquals",
+            "lhs": "$env{DEVKITPRO}",
+            "rhs": ""
+          }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1fcc86b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-TARGET_EXEC:=sm
-
-SRCS:=$(wildcard src/*.c src/snes/*.c) third_party/gl_core/gl_core_3_1.c
-OBJS:=$(SRCS:%.c=%.o)
-
-PYTHON:=/usr/bin/env python3
-CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-O2 -fno-strict-aliasing -Werror )
-CFLAGS:=${CFLAGS} $(shell sdl2-config --cflags) -DSYSTEM_VOLUME_MIXER_AVAILABLE=0 -I.
-
-ifeq (${OS},Windows_NT)
-    WINDRES:=windres
-#    RES:=sm.res
-    SDLFLAGS:=-Wl,-Bstatic $(shell sdl2-config --static-libs)
-else
-    SDLFLAGS:=$(shell sdl2-config --libs) -lm
-endif
-
-.PHONY: all clean clean_obj
-
-all: $(TARGET_EXEC)
-$(TARGET_EXEC): $(OBJS) $(RES)
-	$(CC) $^ -o $@ $(LDFLAGS) $(SDLFLAGS)
-
-%.o : %.c
-	$(CC) -c $(CFLAGS) $< -o $@
-
-#$(RES): src/platform/win32/sm.rc
-#	@echo "Generating Windows resources"
-#	@$(WINDRES) $< -O coff -o $@
-
-clean: clean_obj
-clean_obj:
-	@$(RM) $(OBJS) $(TARGET_EXEC)
diff --git a/sm.sln b/sm.sln
deleted file mode 100644
index 82a190e..0000000
--- a/sm.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32825.248
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sm", "src/sm.vcxproj", "{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Debug|x64.ActiveCfg = Debug|x64
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Debug|x64.Build.0 = Debug|x64
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Debug|x86.ActiveCfg = Debug|Win32
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Debug|x86.Build.0 = Debug|Win32
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Release|x64.ActiveCfg = Release|x64
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Release|x64.Build.0 = Release|x64
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Release|x86.ActiveCfg = Release|Win32
-		{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8F47385F-600A-41BA-AEF8-C47A2C0D15E6}
-	EndGlobalSection
-EndGlobal
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index cbc684b..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/sm.vcxproj.user
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..954f971
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,98 @@
+target_sources(sm PRIVATE
+    "config.c"
+    "config.h"
+    "enemy_types.h"
+    "features.h"
+    "funcs.h"
+    "glsl_shader.c"
+    "glsl_shader.h"
+    "ida_types.h"
+    "main.c"
+    "opengl.c"
+    "sm_80.c"
+    "sm_81.c"
+    "sm_82.c"
+    "sm_84.c"
+    "sm_85.c"
+    "sm_86.c"
+    "sm_87.c"
+    "sm_88.c"
+    "sm_89.c"
+    "sm_8b.c"
+    "sm_8d.c"
+    "sm_8f.c"
+    "sm_90.c"
+    "sm_91.c"
+    "sm_92.c"
+    "sm_93.c"
+    "sm_94.c"
+    "sm_9b.c"
+    "sm_a0.c"
+    "sm_a2.c"
+    "sm_a3.c"
+    "sm_a4.c"
+    "sm_a5.c"
+    "sm_a6.c"
+    "sm_a7.c"
+    "sm_a8.c"
+    "sm_a9.c"
+    "sm_aa.c"
+    "sm_ad.c"
+    "sm_b2.c"
+    "sm_b3.c"
+    "sm_b4.c"
+    "sm_cpu_infra.c"
+    "sm_cpu_infra.h"
+    "sm_rtl.c"
+    "sm_rtl.h"
+    "spc_player.c"
+    "spc_player.h"
+    "spc_variables.h"
+    "tracing.c"
+    "tracing.h"
+    "types.h"
+    "util.c"
+    "util.h"
+    "variables_extra.h"
+    "variables.h"
+
+    "snes/apu.c"
+    "snes/apu.h"
+    "snes/cart.c"
+    "snes/cart.h"
+    "snes/cpu.c"
+    "snes/cpu.h"
+    "snes/dma.c"
+    "snes/dma.h"
+    "snes/dsp.c"
+    "snes/dsp.h"
+    "snes/dsp_regs.h"
+    "snes/input.c"
+    "snes/input.h"
+    "snes/ppu.c"
+    "snes/ppu.h"
+    "snes/saveload.h"
+    "snes/snes.c"
+    "snes/snes.h"
+    "snes/snes_other.c"
+    "snes/spc.c"
+    "snes/spc.h"
+)
+
+if (WIN32)
+    enable_language(RC)
+    target_sources(sm PRIVATE
+        "platform/win32/resource.h"
+        "platform/win32/sm.rc"
+        "platform/win32/volume_control.c"
+        "platform/win32/volume_control.h"
+    )
+endif()
+
+if (NINTENDO_SWITCH)
+    target_include_directories(sm PRIVATE "platform/switch/src")
+    target_sources(sm PRIVATE
+        "platform/switch/src/switch_impl.c"
+        "platform/switch/src/switch_impl.h"
+    )
+endif()
\ No newline at end of file
diff --git a/src/packages.config b/src/packages.config
deleted file mode 100644
index 7ede8af..0000000
--- a/src/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="sdl2.nuget" version="2.26.3" targetFramework="native" />
-  <package id="sdl2.nuget.redist" version="2.26.3" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/sm.vcxproj b/src/sm.vcxproj
deleted file mode 100644
index c7355e7..0000000
--- a/src/sm.vcxproj
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <ProjectGuid>{1F8AB1B4-DAFB-4D6E-BF1E-F802FF5A52EE}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)build\bin-$(Platform)-$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\obj-$(Platform)-$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)build\bin-$(Platform)-$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\obj-$(Platform)-$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\bin-$(Platform)-$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\obj-$(Platform)-$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\bin-$(Platform)-$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\obj-$(Platform)-$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\third_party\gl_core\gl_core_3_1.c" />
-    <ClCompile Include="config.c" />
-    <ClCompile Include="glsl_shader.c" />
-    <ClCompile Include="main.c" />
-    <ClCompile Include="opengl.c" />
-    <ClCompile Include="platform\win32\volume_control.c" />
-    <ClCompile Include="sm_80.c" />
-    <ClCompile Include="sm_81.c" />
-    <ClCompile Include="sm_82.c" />
-    <ClCompile Include="sm_84.c" />
-    <ClCompile Include="sm_85.c" />
-    <ClCompile Include="sm_86.c" />
-    <ClCompile Include="sm_87.c" />
-    <ClCompile Include="sm_88.c" />
-    <ClCompile Include="sm_89.c" />
-    <ClCompile Include="sm_8b.c">
-      <LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdc17</LanguageStandard_C>
-      <LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdc17</LanguageStandard_C>
-      <LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdc17</LanguageStandard_C>
-      <LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdc17</LanguageStandard_C>
-    </ClCompile>
-    <ClCompile Include="sm_8d.c" />
-    <ClCompile Include="sm_8f.c" />
-    <ClCompile Include="sm_90.c" />
-    <ClCompile Include="sm_91.c" />
-    <ClCompile Include="sm_92.c" />
-    <ClCompile Include="sm_93.c" />
-    <ClCompile Include="sm_94.c" />
-    <ClCompile Include="sm_9b.c" />
-    <ClCompile Include="sm_a0.c" />
-    <ClCompile Include="sm_a2.c" />
-    <ClCompile Include="sm_a3.c" />
-    <ClCompile Include="sm_a4.c" />
-    <ClCompile Include="sm_a5.c" />
-    <ClCompile Include="sm_a6.c" />
-    <ClCompile Include="sm_a7.c" />
-    <ClCompile Include="sm_a8.c" />
-    <ClCompile Include="sm_a9.c" />
-    <ClCompile Include="sm_aa.c" />
-    <ClCompile Include="sm_ad.c" />
-    <ClCompile Include="sm_b2.c" />
-    <ClCompile Include="sm_b3.c" />
-    <ClCompile Include="sm_b4.c" />
-    <ClCompile Include="sm_cpu_infra.c" />
-    <ClCompile Include="sm_rtl.c" />
-    <ClCompile Include="snes\apu.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="snes\cart.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
-    </ClCompile>
-    <ClCompile Include="snes\cpu.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="snes\dma.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="snes\dsp.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="snes\input.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
-    </ClCompile>
-    <ClCompile Include="snes\ppu.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="snes\snes.c" />
-    <ClCompile Include="snes\snes_other.c" />
-    <ClCompile Include="snes\spc.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
-    </ClCompile>
-    <ClCompile Include="spc_player.c" />
-    <ClCompile Include="tracing.c" />
-    <ClCompile Include="util.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\third_party\gl_core\gl_core_3_1.h" />
-    <ClInclude Include="config.h" />
-    <ClInclude Include="enemy_defs.h" />
-    <ClInclude Include="enemy_types.h" />
-    <ClInclude Include="features.h" />
-    <ClInclude Include="funcs.h" />
-    <ClInclude Include="glsl_shader.h" />
-    <ClInclude Include="ida_types.h" />
-    <ClInclude Include="sm_cpu_infra.h" />
-    <ClInclude Include="sm_rtl.h" />
-    <ClInclude Include="snes\apu.h" />
-    <ClInclude Include="snes\cart.h" />
-    <ClInclude Include="snes\cpu.h" />
-    <ClInclude Include="snes\dma.h" />
-    <ClInclude Include="snes\dsp.h" />
-    <ClInclude Include="snes\dsp_regs.h" />
-    <ClInclude Include="snes\input.h" />
-    <ClInclude Include="snes\ppu.h" />
-    <ClInclude Include="snes\saveload.h" />
-    <ClInclude Include="snes\snes.h" />
-    <ClInclude Include="snes\spc.h" />
-    <ClInclude Include="spc_player.h" />
-    <ClInclude Include="tracing.h" />
-    <ClInclude Include="types.h" />
-    <ClInclude Include="util.h" />
-    <ClInclude Include="variables.h" />
-    <ClInclude Include="variables_extra.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets" Condition="Exists('..\packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets')" />
-    <Import Project="..\packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets" Condition="Exists('..\packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.nuget.redist.2.26.3\build\native\sdl2.nuget.redist.targets'))" />
-    <Error Condition="!Exists('..\packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\sdl2.nuget.2.26.3\build\native\sdl2.nuget.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/sm.vcxproj.filters b/src/sm.vcxproj.filters
deleted file mode 100644
index 08f7da9..0000000
--- a/src/sm.vcxproj.filters
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Snes">
-      <UniqueIdentifier>{e1763dbc-4fb3-417f-ad1a-8436411c3b7a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Shader">
-      <UniqueIdentifier>{2b72ed96-9194-4c2c-b1e5-15445f0a9550}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_cpu_infra.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_rtl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_80.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_81.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_82.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_84.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_85.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_86.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_87.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_88.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_89.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_8b.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_8d.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_8f.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_90.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_91.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_92.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_93.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_94.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_9b.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a4.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a6.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a7.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a8.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_a9.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_aa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_ad.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_b2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_b3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sm_b4.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="spc_player.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="config.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\win32\volume_control.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\apu.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\cart.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\cpu.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\dma.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\dsp.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\input.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\ppu.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\snes.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\snes_other.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="snes\spc.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="tracing.c">
-      <Filter>Snes</Filter>
-    </ClCompile>
-    <ClCompile Include="glsl_shader.c">
-      <Filter>Shader</Filter>
-    </ClCompile>
-    <ClCompile Include="opengl.c">
-      <Filter>Shader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\gl_core\gl_core_3_1.c">
-      <Filter>Shader</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="sm_cpu_infra.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="types.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="funcs.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="variables.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ida_types.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="variables_extra.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sm_rtl.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="spc_player.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="features.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="enemy_defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="enemy_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\apu.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\cart.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\cpu.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\dma.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\dsp.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\dsp_regs.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\input.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\ppu.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\snes.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\spc.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="tracing.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="snes\saveload.h">
-      <Filter>Snes</Filter>
-    </ClInclude>
-    <ClInclude Include="glsl_shader.h">
-      <Filter>Shader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\third_party\gl_core\gl_core_3_1.h">
-      <Filter>Shader</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/.gitignore b/third_party/.gitignore
deleted file mode 100644
index 1fbecd9..0000000
--- a/third_party/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/tcc/
-/SDL2-2.24.1/
-/gl_core/*.o
\ No newline at end of file
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
new file mode 100644
index 0000000..ea8f19b
--- /dev/null
+++ b/third_party/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(sm PRIVATE
+    "gl_core/gl_core_3_1.c"
+)
\ No newline at end of file