diff --git a/CMakeLists.txt b/CMakeLists.txt
index de5377e2..6ccf86b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,12 @@ include(deps/buildcore/base.cmake)
 
 set(NOSTALGIA_BUILD_PLAYER ON CACHE BOOL "Build Player")
 set(NOSTALGIA_BUILD_STUDIO ON CACHE BOOL "Build Studio")
+set(OLYMPIC_BUILD_STUDIO ON CACHE BOOL "Build Studio")
 set(OX_ENABLE_TRACEHOOK OFF CACHE BOOL "Generate OxTraceHook shared library for uprobes")
 
 if(BUILDCORE_TARGET STREQUAL "gba")
 	set(NOSTALGIA_BUILD_STUDIO OFF)
+	set(OLYMPIC_BUILD_STUDIO OFF)
 	set(TURBINE_BUILD_TYPE "GBA")
 	include(deps/gbabuildcore/base.cmake)
 else()
diff --git a/src/olympic/CMakeLists.txt b/src/olympic/CMakeLists.txt
index f0931e60..30ae56da 100644
--- a/src/olympic/CMakeLists.txt
+++ b/src/olympic/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(applib)
 add_subdirectory(keel)
 add_subdirectory(turbine)
-if(TURBINE_BUILD_TYPE STREQUAL "Native")
+if(${OLYMPIC_BUILD_STUDIO})
     add_subdirectory(studio)
 endif()