diff options
| author | David Reid <[email protected]> | 2018-07-05 22:33:16 +1000 |
|---|---|---|
| committer | David Reid <[email protected]> | 2018-07-05 22:33:16 +1000 |
| commit | 1d354bc7045f14ed47c153c031d68641a80fc6fe (patch) | |
| tree | 9affe50bcb06515d6cbd123df37b6a30a4c7518a /cmake | |
| parent | 63cf43b72947e80791c2a74d98a20e4a96c9af9e (diff) | |
| parent | 7c362370488d740ec89cbdd0803b85ee8336711e (diff) | |
| download | raylib-1d354bc7045f14ed47c153c031d68641a80fc6fe.tar.gz raylib-1d354bc7045f14ed47c153c031d68641a80fc6fe.zip | |
Merge branch 'master' of https://github.com/raysan5/raylib into dr/mini_al
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/test-pkgconfig.sh | 21 | ||||
| -rw-r--r--[-rwxr-xr-x] | cmake/utils.cmake | 14 |
2 files changed, 22 insertions, 13 deletions
diff --git a/cmake/test-pkgconfig.sh b/cmake/test-pkgconfig.sh new file mode 100755 index 00000000..ccbdfb65 --- /dev/null +++ b/cmake/test-pkgconfig.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# Test if including/linking/running an installed raylib works + +set -x +export LD_RUN_PATH=/usr/local/lib + +CFLAGS="-Wall -Wextra -Werror $CFLAGS" +if [ "$ARCH" = "i386" ]; then +CFLAGS="-m32 $CLFAGS" +fi + +cat << EOF | ${CC:-cc} -otest -xc - $(pkg-config --libs --cflags $@ raylib.pc) $CFLAGS && exec ./test +#include <stdlib.h> +#include <raylib.h> + +int main(void) +{ + int num = GetRandomValue(42, 1337); + return 42 <= num && num <= 1337 ? EXIT_SUCCESS : EXIT_FAILURE; +} +EOF diff --git a/cmake/utils.cmake b/cmake/utils.cmake index fc75ef4f..417384ad 100755..100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -11,13 +11,8 @@ if(${PLATFORM} MATCHES "Android") elseif(${PLATFORM} MATCHES "Web") elseif(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}) + set(LIBS_PRIVATE ${OPENGL_LIBRARY}) elseif(WIN32) # no pkg-config --static on Windows yet... else() @@ -34,12 +29,6 @@ else() endif() set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY}) - # TODO: maybe read those out of glfw's cmake config? - if(USE_WAYLAND) - set(LIBS_PRIVATE ${LIBS_PRIVATE} wayland-client wayland-cursor wayland-egl) - else() - set(LIBS_PRIVATE ${LIBS_PRIVATE} X11 Xrandr Xinerama Xi Xxf86vm Xcursor) - endif() endif() if(${PLATFORM} MATCHES "Desktop") @@ -55,7 +44,6 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(LINUX TRUE) - set(LIBS_PRIVATE dl ${LIBS_PRIVATE}) endif() foreach(L ${LIBS_PRIVATE}) |