diff --git a/CMakePresets.json b/CMakePresets.json
index 1674a67dd..62dc89f4f 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -13,7 +13,8 @@
       "inherits": "base",
       "cacheVariables": {
         "PLATFORM_DEFINES": "_WINDOWS64",
-        "PLATFORM_NAME": "Windows64"
+        "PLATFORM_NAME": "Windows64",
+        "IGGY_LIBS": "iggy_w64.lib;iggyperfmon_w64.lib;iggyexpruntime_w64.lib"
       }
     },
     {
@@ -23,7 +24,8 @@
       "toolchainFile": "${sourceDir}/cmake/toolchains/durango.cmake",
       "cacheVariables": {
         "PLATFORM_DEFINES": "_DURANGO;_XBOX_ONE",
-        "PLATFORM_NAME": "Durango"
+        "PLATFORM_NAME": "Durango",
+        "IGGY_LIBS": "iggy_durango.lib;iggyperfmon_durango.lib"
       }
     },
     {
@@ -33,7 +35,8 @@
       "toolchainFile": "${sourceDir}/cmake/toolchains/orbis.cmake",
       "cacheVariables": {
         "PLATFORM_DEFINES": "__ORBIS__",
-        "PLATFORM_NAME": "Orbis"
+        "PLATFORM_NAME": "Orbis",
+        "IGGY_LIBS": "libiggy_orbis.a;libiggyperfmon_orbis.a"
       }
     },
     {
@@ -43,7 +46,8 @@
       "toolchainFile": "${sourceDir}/cmake/toolchains/ps3.cmake",
       "cacheVariables": {
         "PLATFORM_DEFINES": "__PS3__",
-        "PLATFORM_NAME": "PS3"
+        "PLATFORM_NAME": "PS3",
+        "IGGY_LIBS": "libiggy_ps3.a;libiggyperfmon_ps3.a;libiggyexpruntime_ps3.a"
       }
     },
     {
@@ -53,7 +57,8 @@
       "toolchainFile": "${sourceDir}/cmake/toolchains/psvita.cmake",
       "cacheVariables": {
         "PLATFORM_DEFINES": "__PSVITA__",
-        "PLATFORM_NAME": "PSVita"
+        "PLATFORM_NAME": "PSVita",
+        "IGGY_LIBS": "libiggy_psp2.a;libiggyperfmon_psp2.a"
       }
     },
     {
diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt
index d98389c28..709ff2a71 100644
--- a/Minecraft.Client/CMakeLists.txt
+++ b/Minecraft.Client/CMakeLists.txt
@@ -52,9 +52,6 @@ target_link_libraries(Minecraft.Client PRIVATE
   XInput9_1_0
   wsock32
   legacy_stdio_definitions
-  "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/lib/iggy_w64.lib"
-  "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/lib/iggyperfmon_w64.lib"
-  "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/lib/iggyexpruntime_w64.lib"
   $<$<CONFIG:Debug>: # Debug 4J libraries
     "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Input_d.lib"
     "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Storage_d.lib"
@@ -67,6 +64,11 @@ target_link_libraries(Minecraft.Client PRIVATE
   >
 )
 
+# Iggy libs
+foreach(lib IN LISTS IGGY_LIBS)
+  target_link_libraries(Minecraft.Client PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/libs/${lib}")
+endforeach()
+
 # ---
 # Asset / redist copy
 # ---