diff --git a/CMakeLists.txt b/CMakeLists.txt
index 570f527..f58f215 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,17 +84,19 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 #message(FATAL_ERROR "glfw3.lib not found")
 #endif()
 
-find_package(glfw3 REQUIRED)
+find_package(glfw3 CONFIG REQUIRED)
 
 # Find GLEW
 
+# set(GLEW_USE_STATIC_LIBS, true)
+
 find_package(GLEW REQUIRED)
 
 if(GLEW_FOUND)
 set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS})
-get_filename_component(GLEW_LIBRARIES ${GLEW_LIBRARIES} DIRECTORY)
+#get_filename_component(GLEW_LIBRARIES ${GLEW_LIBRARIES} DIRECTORY)
 message(STATUS "GLEW_INCLUDE_DIR: ${GLEW_INCLUDE_DIR}")
-message(STATUS "GLEW_LIBRARIES: ${GLEW_LIBRARIES}")
+#message(STATUS "GLEW_LIBRARIES: ${GLEW_LIBRARIES}")
 else()
 message(FATAL_ERROR "GLEW not found")
 endif()
@@ -182,7 +184,12 @@ ${GLEW_INCLUDE_DIR}
 ${GLEW_INCLUDE_DIRS})
 
 target_link_directories(${PROJECT_NAME} PUBLIC ${GLFW_LIB_DIR} ${GLEW_LIBRARIES} ${ComputeEngine_LIB_DIR} ${ComputeEngine_INCLUDE_DIR})
-target_link_libraries(${PROJECT_NAME} glfw OpenGL::GL GLEW::GLEW ComputeEngine)
+
+if(WIN32)
+	target_link_libraries(${PROJECT_NAME} glfw GLEW::GLEW ComputeEngine)
+else()
+	target_link_libraries(${PROJECT_NAME} glfw OpenGL::GL GLEW::GLEW ComputeEngine)
+endif()
 
 # Copy shaders, assets and configs for binaries to access
 file(COPY shaders DESTINATION ${CMAKE_BINARY_DIR}/Release)
diff --git a/ComputeEngine b/ComputeEngine
index 133701c..d84a7a9 160000
--- a/ComputeEngine
+++ b/ComputeEngine
@@ -1 +1 @@
-Subproject commit 133701c4174c00b869988bdc8b21234dc6d5e718
+Subproject commit d84a7a93da7c7b6c60ed044f25add70b1cd13352
diff --git a/build.bat b/build.bat
index b4ae87f..b139dae 100644
--- a/build.bat
+++ b/build.bat
@@ -1,8 +1,6 @@
 @echo off 
 
-set GLFW_ROOT=
-set GLEW_ROOT=
-set stb_image_ROOT=
 set ComputeEngine_ROOT=%CD%/ComputeEngine
+set vcpkg_ROOT=C:\Desktop\git\vcpkg\scripts\buildsystems\vcpkg.cmake
 
-cmake --build build --config Release
\ No newline at end of file
+cmake --build build --config Release -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT%
\ No newline at end of file
diff --git a/make_all.bat b/make_all.bat
index 01e8af2..b7e9212 100644
--- a/make_all.bat
+++ b/make_all.bat
@@ -1,10 +1,9 @@
 @echo off 
 
-set GLFW_ROOT=
-set GLEW_ROOT=
-set stb_image_ROOT=
 set ComputeEngine_ROOT=%CD%/ComputeEngine
+set vcpkg_ROOT=C:\Desktop\git\vcpkg\scripts\buildsystems\vcpkg.cmake
 
-cmake -B ComputeEngine/build -S ComputeEngine -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT%
+cmake -B ComputeEngine/build -S ComputeEngine -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% -DVCPKG_TARGET_TRIPLET=x64-windows-static
 cmake --build ComputeEngine/build --config Release
-cmake -B build -S . -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT% -DComputeEngine_ROOT=%ComputeEngine_ROOT%
\ No newline at end of file
+cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% -DVCPKG_TARGET_TRIPLET=x64-windows-static
+cmake --build build --config Release
\ No newline at end of file