Merge branch 'raysan5:master' into master

Author: jopadan

cmake/raylib-config.cmake

@@ -1,6 +1,6 @@
 # - Try to find raylib
 # Options:
-#   raylib_USE_STATIC_LIBS - OFF by default
+#   raylib_USE_STATIC_LIBS - ON by default
 #   raylib_VERBOSE         - OFF by default
 # Once done, this defines a raylib target that can be passed to
 # target_link_libraries as well as following variables:
@@ -11,6 +11,9 @@
 #   raylib_LDFLAGS - The linker flags needed with raylib
 #   raylib_DEFINITIONS - Compiler switches required for using raylib
 
+option(raylib_USE_STATIC_LIBS "Use static libs" ON)
+option(raylib_VERBOSE "Use static libs" OFF)
+
 if (NOT TARGET raylib)
     set(XPREFIX PC_RAYLIB)
 
@@ -25,23 +28,22 @@ if (NOT TARGET raylib)
 
     find_path(raylib_INCLUDE_DIR
         NAMES raylib.h
-        HINTS ${${XPREFIX}_INCLUDE_DIRS}
+        HINTS ${${XPREFIX}_INCLUDE_DIRS} ${raylib_DIR}/../../../include/
     )
 
-    set(RAYLIB_NAMES raylib)
 
     if (raylib_USE_STATIC_LIBS)
-        set(RAYLIB_NAMES libraylib.a raylib.lib ${RAYLIB_NAMES})
-    endif()
+        set(RAYLIB_NAMES libraylib.a raylib.lib)
+    else ()
+        set(RAYLIB_NAMES raylib)
+    endif ()
 
     find_library(raylib_LIBRARY
         NAMES ${RAYLIB_NAMES}
-        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+        HINTS ${${XPREFIX}_LIBRARY_DIRS} ${raylib_DIR}/../../
     )
 
     set(raylib_LIBRARIES    ${raylib_LIBRARY})
-    set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
-    set(raylib_LIBRARY_DIR  ${raylib_LIBRARY_DIRS})
     set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR})
     set(raylib_LDFLAGS      ${${XPREFIX}_LDFLAGS})