Merge pull request #458 from raysan5/develop

Integrate develop branch into master

1 files changed, 72 insertions, 33 deletions

diff --git a/utils.cmake b/utils.cmake
index c902f60e..68fd1f76 100644
--- a/utils.cmake
+++ b/utils.cmake
@@ -1,49 +1,88 @@
 # All sorts of things that we need cross project
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 2.8.0)
 
-# Detect linux
-if(UNIX AND NOT APPLE)
+set(USE_EXTERNAL_GLFW  OFF  CACHE STRING "Link raylib against system GLFW instead of embedded one")
+set_property(CACHE USE_EXTERNAL_GLFW PROPERTY STRINGS ON OFF IF_POSSIBLE)
+
+# Linking for OS X -framework options
+# Will do nothing on other OSes
+if(APPLE)
+  find_library(OPENGL_LIBRARY OpenGL)
+  find_library(COCOA_LIBRARY Cocoa)
+  find_library(IOKIT_LIBRARY IOKit)
+  find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+  find_library(COREVIDEO_LIBRARY CoreVideo)
+
+  set(LIBS_PRIVATE ${OPENGL_LIBRARY} ${COCOA_LIBRARY}
+                   ${IOKIT_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREVIDEO_LIBRARY})
+elseif(WIN32)
+  # no pkg-config --static on Windows yet...
+else()
+  find_library(pthread NAMES pthread)
+  find_package(OpenGL)
+  if ("${OPENGL_LIBRARIES}" STREQUAL "")
+    # CFLAGS=-m32 cmake on Linux fails for some reason, so fallback to hardcoding
+    set(LIBS_PRIVATE m pthread GL X11 Xrandr Xinerama Xi Xxf86vm Xcursor)
+  else()
+    find_package(X11 REQUIRED X11)
+    find_library(XRANDR_LIBRARY Xrandr)
+    find_library(XI_LIBRARY Xi)
+    find_library(XINERAMA_LIBRARY Xinerama)
+    find_library(XXF86VM_LIBRARY Xxf86vm)
+    find_library(XCURSOR_LIBRARY Xcursor)
+    include_directories(${OPENGL_INCLUDE_DIR})
+
+    set(LIBS_PRIVATE m ${pthread} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${XRANDR_LIBRARY} ${XINERAMA_LIBRARY} ${XI_LIBRARY} ${XXF86VM_LIBRARY} ${XCURSOR_LIBRARY})
+  endif()
+endif()
+
+if(USE_EXTERNAL_GLFW STREQUAL "ON")
+    find_package(glfw3 3.2.1 REQUIRED)
+elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE")
+    find_package(glfw3 3.2.1)
+endif()
+if (glfw3_FOUND)
+  set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
+endif()
+
+
+if(CMAKE_SYSTEM_NAME STREQUAL Linux)
   set(LINUX TRUE)
+  set(LIBS_PRIVATE dl ${LIBS_PRIVATE})
 endif()
 
-# Need GLFW 3.2.1
-find_package(glfw3 3.2.1 REQUIRED)
+foreach(L ${LIBS_PRIVATE})
+  get_filename_component(DIR  ${L} PATH)
+  get_filename_component(LIBFILE ${L} NAME_WE)
+  STRING(REGEX REPLACE "^lib" "" FILE ${LIBFILE})
 
+  if (${L} MATCHES "[.]framework$")
+      set(FILE_OPT "-framework ${FILE}")
+      set(DIR_OPT  "-F${DIR}")
+  else()
+      set(FILE_OPT "-l${FILE}")
+      set(DIR_OPT  "-L${DIR}")
+  endif()
 
-# Linking for OS X -framework options
-# Will do nothing on other OSes
-function(link_os_x_frameworks binary)
-  if(APPLE)
-    find_library(OPENGL_LIBRARY OpenGL)
-    find_library(OPENAL_LIBRARY OpenAL)
-    find_library(COCOA_LIBRARY Cocoa)
-
-    set(OSX_FRAMEWORKS ${OPENGL_LIBRARY} ${OPENAL_LIBRARY} ${COCOA_LIBRARY})
-    target_link_libraries(${binary} ${OSX_FRAMEWORKS})
+  if ("${DIR}" STREQUAL "" OR "${DIR}" STREQUAL "${LASTDIR}")
+      set (DIR_OPT "")
   endif()
-endfunction()
+
+  set(LASTDIR ${DIR})
+
+  set(PKG_CONFIG_LIBS_PRIVATE ${PKG_CONFIG_LIBS_PRIVATE} ${DIR_OPT} ${FILE_OPT})
+  string (REPLACE ";" " " PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE}")
+endforeach(L)
+
 
 
 # Do the linking for executables that are meant to link raylib
 function(link_libraries_to_executable executable)
-  # Link the libraries
-  if(APPLE)
-    # OS X, we use frameworks
-    link_os_x_frameworks(${executable})
-  elseif(LINUX)
-    # Elsewhere (such as Linux), need `-lopenal -lGL`, etc...
-    target_link_libraries(${executable} m pthread dl)
-    target_link_libraries(${executable} openal)
-    target_link_libraries(${executable} GL)
-    target_link_libraries(${executable} X11 Xrandr Xinerama Xi Xxf86vm Xcursor)  # X11 stuff
+  # Link raylib
+  if (TARGET raylib_shared)
+    target_link_libraries(${executable} raylib_shared)
   else()
-    # TODO windows
+    target_link_libraries(${executable} raylib ${PKG_CONFIG_LIBS_PRIVATE})
   endif()
-  
-  # Add in GLFW as a linking target
-  target_link_libraries(${executable} glfw)
-
-  # And raylib
-  target_link_libraries(${executable} raylib)
 endfunction()