diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7e1826bd..9750d0762 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,37 +180,39 @@ elseif(NOT USE_GLES2 AND NOT SERVER_ONLY)
     endif()
 endif()
 
-if(MSVC OR APPLE)
-    if (NOT APPLE)
+if(MSVC)
     # Build zlib library
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
     include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
 
     set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/")
     set(ZLIB_LIBRARY zlibstatic)
-    endif()
-
-    # Build png library
-    set(SKIP_INSTALL_ALL TRUE)
-    set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
-    set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
-    set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
-
-    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
-    set(PNG_LIBRARY png_static)
 endif()
 
-# Add jpeg library
-if (APPLE)
-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
-    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
-    set(JPEG_LIBRARY jpeglib)
-else()
-    find_package(JPEG REQUIRED)
-    include_directories(${JPEG_INCLUDE_DIR})
+if (NOT SERVER_ONLY)
+    if(MSVC OR APPLE)
+        # Build png library
+        set(SKIP_INSTALL_ALL TRUE)
+        set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
+        set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
+        set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
+
+        set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+        set(PNG_LIBRARY png_static)
+    endif()
+
+    # Add jpeg library
+    if (APPLE)
+        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+        include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+        set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+        set(JPEG_LIBRARY jpeglib)
+    else()
+        find_package(JPEG REQUIRED)
+        include_directories(${JPEG_INCLUDE_DIR})
+    endif()
 endif()
 
 if (BUILD_RECORDER)
@@ -480,7 +482,6 @@ target_link_libraries(supertuxkart
     ${CURL_LIBRARIES}
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
-    ${JPEG_LIBRARIES}
     ${OPENSSL_CRYPTO_LIBRARY}
     )
 
@@ -491,7 +492,11 @@ if(NOT SERVER_ONLY)
         target_link_libraries(supertuxkart GLESv2)
     endif()
 
-    target_link_libraries(supertuxkart ${SQUISH_LIBRARY} ${FREETYPE_LIBRARIES} graphics_utils)
+    target_link_libraries(supertuxkart
+        ${SQUISH_LIBRARY}
+        ${FREETYPE_LIBRARIES}
+        ${JPEG_LIBRARIES}
+        graphics_utils)
 endif()
 
 if(UNIX AND NOT APPLE)
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index 3c4152908..3c5a3907b 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -58,6 +58,14 @@ if(NOT SERVER_ONLY)
         endif()        
     endif()
 else()
+    add_definitions(-DNO_IRR_COMPILE_WITH_LIBPNG_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_LIBJPEG_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_BMP_LOADER_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_PNG_LOADER_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_JPG_LOADER_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_BMP_WRITER_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_PNG_WRITER_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_JPG_WRITER_)
     add_definitions(-DNO_IRR_COMPILE_WITH_OPENGL_)
     add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
     add_definitions(-DNO_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
@@ -591,9 +599,10 @@ endif()
 
 add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
 
-target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
+target_link_libraries(stkirrlicht ${ZLIB_LIBRARY})
 
 if(NOT SERVER_ONLY)
+    target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY})
     if(UNIX AND NOT APPLE)
         target_link_libraries(stkirrlicht ${X11_X11_LIB} ${X11_Xrandr_LIB})
     endif()