diff --git a/CMakeLists.txt b/CMakeLists.txt
index aebd4c4b..be74c4da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if (ENABLE_MSAN AND ENABLE_ASAN)
     MESSAGE(WARNING "Compiling with both AddressSanitizer and MemorySanitizer is not recommended")
 endif()
 
-add_subdirectory(src release)
+add_subdirectory(src)
 
 if (${BUILD_EXAMPLES})
   add_subdirectory(examples)
diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake
index e2e5e9ae..5ad55b16 100644
--- a/cmake/raylib-config.cmake
+++ b/cmake/raylib-config.cmake
@@ -16,8 +16,8 @@ if (raylib_USE_STATIC_LIBS)
     set(XPREFIX ${XPREFIX}_STATIC)
 endif()
 
-find_package(PkgConfig)
-pkg_check_modules(${XPREFIX} REQUIRED raylib)
+find_package(PkgConfig QUIET)
+pkg_check_modules(${XPREFIX} QUIET raylib)
 set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS})
 
 find_path(raylib_INCLUDE_DIR
@@ -25,10 +25,17 @@ find_path(raylib_INCLUDE_DIR
     HINTS ${${XPREFIX}_INCLUDE_DIRS}
 )
 
-find_library(raylib_LIBRARY
-    NAMES raylib
-    HINTS ${${XPREFIX}_LIBRARY_DIRS}
-)
+if (raylib_USE_STATIC_LIBS)
+    find_library(raylib_LIBRARY
+        NAMES raylib_static
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+else ()
+    find_library(raylib_LIBRARY
+        NAMES raylib
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+endif ()
 
 set(raylib_LIBRARIES    ${raylib_LIBRARY})
 set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c65a4996..7b69e0f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,6 +188,13 @@ if(SHARED)
       PUBLIC ${GRAPHICS}
   )
 
+  if(MSVC)
+    target_compile_definitions(raylib
+      PRIVATE $<BUILD_INTERFACE:BUILD_LIBTYPE_SHARED>
+      INTERFACE $<INSTALL_INTERFACE:USE_LIBTYPE_SHARED>
+    )
+  endif()
+
   set(PKG_CONFIG_LIBS_EXTRA "")
 
   set_property(TARGET raylib PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -214,7 +221,9 @@ if(SHARED)
   if (WIN32)
     install(
       TARGETS raylib
-      RUNTIME DESTINATION "lib"
+      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
       PUBLIC_HEADER DESTINATION "include"
     )
   else()