diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt
index edb91c90e..2bcb72f14 100644
--- a/Editor/CMakeLists.txt
+++ b/Editor/CMakeLists.txt
@@ -34,6 +34,8 @@ set (SOURCE_FILES
 	xatlas.cpp
 )
 
+add_subdirectory(meshoptimizer)
+
 if (WIN32)
 	list (APPEND SOURCE_FILES
 		Editor.rc
@@ -42,7 +44,8 @@ if (WIN32)
 	add_executable(WickedEngineEditor WIN32 ${SOURCE_FILES})
 
 	target_link_libraries(WickedEngineEditor PUBLIC
-		WickedEngine_Windows 
+		WickedEngine_Windows
+		meshoptimizer
 	)
 
 	set_property(TARGET WickedEngineEditor PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
@@ -52,6 +55,7 @@ else ()
 	target_link_libraries(WickedEngineEditor PUBLIC
 		WickedEngine 
 		Threads::Threads
+		meshoptimizer
 	)
 	
 	# Copy shaders to build and source folders just to be safe:
diff --git a/Editor/meshoptimizer/CMakeLists.txt b/Editor/meshoptimizer/CMakeLists.txt
new file mode 100644
index 000000000..a861a8e87
--- /dev/null
+++ b/Editor/meshoptimizer/CMakeLists.txt
@@ -0,0 +1,19 @@
+set (SOURCE_FILES
+	allocator.cpp
+	clusterizer.cpp
+	indexcodec.cpp
+	indexgenerator.cpp
+	overdrawanalyzer.cpp
+	overdrawoptimizer.cpp
+	simplifier.cpp
+	spatialorder.cpp
+	stripifier.cpp
+	vcacheanalyzer.cpp
+	vcacheoptimizer.cpp
+	vertexcodec.cpp
+	vertexfilter.cpp
+	vfetchanalyzer.cpp
+	vfetchoptimizer.cpp
+)
+
+add_library(meshoptimizer STATIC ${SOURCE_FILES})