Fix build on MacOSX.

diff --git a/.gitignore b/.gitignore
index cdd2823e2e126800af46bac36d29251704dffdd3..87f2f6732c40163209b661fbeff05aad3d41681d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.bmp
 *.bz2
 *.dll
+*.dylib
 *.exe
 *.exp
 *.ilk

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a157889e3092e81457fb6aabc030c192b8c4a04b..a25357d24c46c0d7d80fa72184e222c7e5428ef9 100755 (executable)
--- 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)