From 8248a0f116dd526a9650d5dbc6a594ce296113b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 20 Apr 2011 21:09:56 +0100 Subject: [PATCH] Fix build on MacOSX. --- .gitignore | 1 + CMakeLists.txt | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index cdd2823..87f2f67 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.bmp *.bz2 *.dll +*.dylib *.exe *.exp *.ilk diff --git a/CMakeLists.txt b/CMakeLists.txt index a157889..a25357d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,12 @@ if (NOT WIN32) find_package (ZLIB) find_package (PNG) find_package (X11 REQUIRED) + + # We use GLX on MacOSX, which is in a separate library + if (APPLE) + find_library (X11_GL_LIB GL ${X11_LIB_SEARCH_PATH}) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_GL_LIB}) + endif (APPLE) else (NOT WIN32) find_package (DirectX) endif (NOT WIN32) -- 2.43.0