Fix build on MacOSX.

apitrace · Apr 20, 2011 · 8248a0f · 8248a0f
1 parent f01b7f5
commit 8248a0f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.bmp
 *.bz2
 *.dll
+*.dylib
 *.exe
 *.exp
 *.ilk

diff --git 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)