diff --git a/CMakeLists.txt b/CMakeLists.txt
index 435e8507..7353bf44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,7 @@ if(FEATURE_SSL AND BUNDLED_WOLFSSL AND (BUILD_CLIENT OR BUILD_SERVER))
 	set_target_properties(bundled_wolfssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
 
 	add_dependencies(bundled_wolfssl_int bundled_wolfssl)
-	target_link_directories(bundled_wolfssl_int INTERFACE ${WOLFSSL_BUNDLED_LIBRARY})
+	target_link_libraries(bundled_wolfssl_int INTERFACE ${WOLFSSL_BUNDLED_LIBRARY})
 	target_include_directories(bundled_wolfssl_int INTERFACE "${LIBS_BINARY_DIR}/wolfssl/include" "${LIBS_BINARY_DIR}/wolfssl/include/wolfssl")
 	target_compile_definitions(bundled_wolfssl_int INTERFACE ETL_WOLFSSL)
 else()
@@ -225,7 +225,7 @@ if (FEATURE_SSL AND BUNDLED_OPENSSL AND (BUILD_CLIENT OR BUILD_SERVER))
 		set_target_properties(bundled_openssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
 
 		add_dependencies(bundled_openssl_int bundled_openssl)
-		target_link_directories(bundled_openssl_int INTERFACE ${OPENSSL_BUNDLED_LIBRARY})
+		target_link_libraries(bundled_openssl_int INTERFACE ${OPENSSL_BUNDLED_LIBRARY})
 		target_include_directories(bundled_openssl_int INTERFACE "${OPENSSL_PREFIX}/include")
 	elseif (UNIX)
 		# FIXME: check flags
@@ -273,7 +273,7 @@ if (FEATURE_SSL AND BUNDLED_OPENSSL AND (BUILD_CLIENT OR BUILD_SERVER))
 		set(OPENSSL_BUNDLED_INCLUDE_DIR "${LIBS_BINARY_DIR}/openssl/include")
 
 		add_dependencies(bundled_openssl_int bundled_openssl)
-		target_link_directories(bundled_openssl_int INTERFACE ${OPENSSL_BUNDLED_LIBRARY})
+		target_link_libraries(bundled_openssl_int INTERFACE ${OPENSSL_BUNDLED_LIBRARY})
 		target_include_directories(bundled_openssl_int INTERFACE "${LIBS_BINARY_DIR}/openssl/include")
 	endif()
 else()
@@ -289,13 +289,14 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
 
 	if (WIN32)
 		set(binary_dir "${LIBS_BINARY_DIR}/curl")
+
 		if(VSTUDIO)
-			set(CURL_BUNDLED_LIBRARY optimized "${binary_dir}/lib/Release/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/lib/Debug/libcurl-d${CMAKE_STATIC_LIBRARY_SUFFIX}")
-		elseif(MINGW OR VS_BUILD)
-			set(CURL_BUNDLED_LIBRARY optimized "${binary_dir}/lib/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/lib/libcurl-d${CMAKE_STATIC_LIBRARY_SUFFIX}")
-		else(VSTUDIO)
-			set(CURL_BUNDLED_LIBRARY "${binary_dir}/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}")
-		endif(VSTUDIO)
+			set(CURL_BUNDLED_LIBRARIES optimized "${binary_dir}/lib/Release/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/lib/Debug/libcurl-d${CMAKE_STATIC_LIBRARY_SUFFIX}")
+		elseif(MINGW OR VS_BUILD OR VSTUDIO)
+			set(CURL_BUNDLED_LIBRARIES optimized "${binary_dir}/lib/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/lib/libcurl-d${CMAKE_STATIC_LIBRARY_SUFFIX}")
+		else()
+			set(CURL_BUNDLED_LIBRARIES "${binary_dir}/libcurl${CMAKE_STATIC_LIBRARY_SUFFIX}")
+		endif()
 
 		set(CURL_CMAKE_ARGS
 				-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
@@ -333,7 +334,7 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
 			list(APPEND CURL_CMAKE_ARGS -DCMAKE_USE_OPENSSL=OFF)
 		endif()
 
-		etl_find_lib_path(CURL_BUNDLED_LIBRARY _CURL_OUTPUT)
+		etl_find_lib_path(CURL_BUNDLED_LIBRARIES _CURL_OUTPUT)
 
 		# -DHTTP_ONLY=ON
 		ExternalProject_Add(bundled_curl
@@ -352,7 +353,7 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
 		set_target_properties(bundled_curl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
 
 		add_dependencies(bundled_curl_int bundled_curl)
-		target_link_directories(bundled_curl_int INTERFACE ${CURL_BUNDLED_LIBRARY})
+		target_link_libraries(bundled_curl_int INTERFACE ${CURL_BUNDLED_LIBRARIES})
 		target_include_directories(bundled_curl_int INTERFACE "${LIBS_BINARY_DIR}/curl/include")
 	elseif (UNIX)
 		# FIXME: add openssl lib to project
@@ -422,7 +423,7 @@ if(BUNDLED_CURL AND (BUILD_CLIENT OR BUILD_SERVER))
 				BUILD_IN_SOURCE 1
 		)
 		add_dependencies(bundled_curl_int bundled_curl)
-		target_link_directories(bundled_curl_int INTERFACE ${CURL_BUNDLED_LIBRARY})
+		target_link_libraries(bundled_curl_int INTERFACE ${CURL_BUNDLED_LIBRARY})
 		target_include_directories(bundled_curl_int INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/libs/curl/include")
 	endif()
 endif()
@@ -433,7 +434,7 @@ endif()
 if(BUNDLED_OPENAL AND BUILD_CLIENT)
 	add_library(bundled_openal_int INTERFACE)
 
-	if (WIN)
+	if (WIN32)
 		set(binary_dir "${LIBS_BINARY_DIR}/openal")
 		if(VSTUDIO)
 			set(OPENAL_BUNDLED_LIBRARIES optimized "${binary_dir}/Release/OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/Debug/OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -460,7 +461,7 @@ if(BUNDLED_OPENAL AND BUILD_CLIENT)
 		set_target_properties(bundled_openal PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER})
 
 		add_dependencies(bundled_openal_int bundled_openal)
-		target_link_directories(bundled_openal_int INTERFACE ${OPENAL_BUNDLED_LIBRARIES})
+		target_link_libraries(bundled_openal_int INTERFACE ${OPENAL_BUNDLED_LIBRARIES})
 		target_include_directories(bundled_openal_int INTERFACE "${CMAKE_CURRENT_LIST_DIR}/openal/include")
 		target_compile_definitions(bundled_openal_int INTERFACE AL_LIBTYPE_STATIC)
 	elseif(UNIX)
@@ -480,7 +481,7 @@ if(BUNDLED_OPENAL AND BUILD_CLIENT)
 		ExternalProject_Get_Property(bundled_openal binary_dir)
 
 		add_dependencies(bundled_openal_int bundled_openal)
-		target_link_directories(bundled_openal_int INTERFACE ${OPENAL_BUNDLED_LIBRARIES})
+		target_link_libraries(bundled_openal_int INTERFACE ${OPENAL_BUNDLED_LIBRARIES})
 		target_include_directories(bundled_openal_int INTERFACE "${CMAKE_CURRENT_LIST_DIR}/openal/include")
 		target_compile_definitions(bundled_openal_int INTERFACE AL_LIBTYPE_STATIC)
 	endif()
@@ -960,7 +961,7 @@ if(BUNDLED_PNG AND BUILD_CLIENT)
 
 	set(binary_dir "${LIBS_BINARY_DIR}/libpng")
 	if(VSTUDIO)
-		set(PNG_BUNDLED_LIBRARIES optimized "${binary_dir}/Release/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/Debug/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}")
+		set(PNG_BUNDLED_LIBRARIES optimized "${binary_dir}/Release/libpng16_static${CMAKE_STATIC_LIBRARY_SUFFIX}" debug "${binary_dir}/Debug/libpng16_staticd${CMAKE_STATIC_LIBRARY_SUFFIX}")
 	elseif(VS_BUILD)
 		set(PNG_BUNDLED_LIBRARIES "${binary_dir}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}")
 	else()