Menu
▾
▴
[gst-cvs] gst-plugins-gl: make the cmake build work on MacOSX
|
From: <ca...@ke...> - 2009-07-24 08:35:19
|
Module: gst-plugins-gl Branch: master Commit: 308932f4da59396f444d06a0afad3c5fd16079d9 URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-gl/commit/?id=308932f4da59396f444d06a0afad3c5fd16079d9 Author: Julien Isorce <jul...@gm...> Date: Fri Jul 24 10:33:47 2009 +0200 make the cmake build work on MacOSX We can now generate a Xcode project (or Unix Makfiles), see INSTALL file --- INSTALL | 22 ++++++++++++++++ cmake/modules/FindGlib2.cmake | 12 ++++---- gst-libs/gst/gl/CMakeLists.txt | 55 +++++++++++++++++++++++++++++---------- gst/gl/CMakeLists.txt | 2 +- 4 files changed, 70 insertions(+), 21 deletions(-) diff --git a/INSTALL b/INSTALL index 12d83b5..28c78b0 100644 --- a/INSTALL +++ b/INSTALL @@ -120,6 +120,28 @@ KDevelop3, KDevelop3 - Unix Makefiles etc...) +------------------ +* cmake on MacOSX: +------------------ + +-Unix Makefiles: +cd gst-plugins-gl +cd .. +mkdir unix +cd unix +cmake -G "Unix Makefiles" ../gst-plugins-gl +make +result is gst/gl/libgstopengl.so + +-Xcode: +cd gst-plugins-gl +cd .. +mkdir xcode +cd xcode +cmake -G Xcode ../gst-plugins-gl +Open GST-PLUGINS-GL.xcode +result is gst/gl/Debug/libgstopengl.so + Unix frozen builds: autotools or unix/codeblocks ================================================ diff --git a/cmake/modules/FindGlib2.cmake b/cmake/modules/FindGlib2.cmake old mode 100644 new mode 100755 index 657bdd9..821296c --- a/cmake/modules/FindGlib2.cmake +++ b/cmake/modules/FindGlib2.cmake @@ -3,33 +3,33 @@ FILE(TO_CMAKE_PATH "${GLIB2_DIR}" TRY2_DIR) FILE(GLOB GLIB2_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(GLIB_glib_2_INCLUDE_DIR glib.h - PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/include/glib-2.0 /usr/local/include/glib-2.0 /usr/include/glib-2.0 + PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/include/glib-2.0 /usr/local/include/glib-2.0 /usr/include/glib-2.0 /opt/local/include/glib-2.0 ENV INCLUDE DOC "Directory containing glib.h include file") FIND_PATH(GLIB_glibconfig_2_INCLUDE_DIR glibconfig.h - PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/include/glib-2.0 ${GLIB2_DIR}/lib/include ${GLIB2_DIR}/lib/glib-2.0/include /usr/local/include/glib-2.0 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/local/lib/glib-2.0/include + PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/include/glib-2.0 ${GLIB2_DIR}/lib/include ${GLIB2_DIR}/lib/glib-2.0/include /usr/local/include/glib-2.0 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/local/lib/glib-2.0/include /opt/local/lib/glib-2.0/include ENV INCLUDE DOC "Directory containing glibconfig.h include file") FIND_LIBRARY(GLIB_glib_2_LIBRARY NAMES glib-2.0 - PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib ENV LIB DOC "glib library to link with" NO_SYSTEM_ENVIRONMENT_PATH) FIND_LIBRARY(GLIB_gmodule_2_LIBRARY NAMES gmodule-2.0 - PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib ENV LIB DOC "gmodule library to link with" NO_SYSTEM_ENVIRONMENT_PATH) FIND_LIBRARY(GLIB_gobject_2_LIBRARY NAMES gobject-2.0 - PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib ENV LIB DOC "gobject library to link with" NO_SYSTEM_ENVIRONMENT_PATH) FIND_LIBRARY(GLIB_gthread_2_LIBRARY NAMES gthread-2.0 - PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib + PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib /opt/local/lib ENV LIB DOC "gthread library to link with" NO_SYSTEM_ENVIRONMENT_PATH) diff --git a/gst-libs/gst/gl/CMakeLists.txt b/gst-libs/gst/gl/CMakeLists.txt old mode 100644 new mode 100755 index 4e05d1f..3b6b21c --- a/gst-libs/gst/gl/CMakeLists.txt +++ b/gst-libs/gst/gl/CMakeLists.txt @@ -35,19 +35,46 @@ target_link_libraries(gstgl else (WIN32) -include_directories(AFTER - ../../..) + if (APPLE) + + include_directories(AFTER + ../../..) + + add_library (gstgl STATIC + gstglwindow_cocoa.m + gstgldisplay.c + gstglbuffer.c + gstglfilter.c + gstglshader.c) + + target_link_libraries(gstgl + general ${OPENGL_LIBRARIES} + general ${GLEW_LIBRARY} + general ${GLIB2_LIBRARIES} + general ${GSTREAMER_LIBRARIES} + "-L/opt/local/lib" + "-lintl" + "-framework OpenGL" + "-framework Cocoa") -add_library (gstgl STATIC - gstglwindow_x11.c - gstgldisplay.c - gstglbuffer.c - gstglfilter.c - gstglshader.c) - -target_link_libraries(gstgl - general ${OPENGL_LIBRARIES} - general ${GLEW_LIBRARY} - general ${GLIB2_LIBRARIES} - general ${GSTREAMER_LIBRARIES}) + else (APPLE) + + include_directories(AFTER + ../../..) + + add_library (gstgl STATIC + gstglwindow_x11.c + gstgldisplay.c + gstglbuffer.c + gstglfilter.c + gstglshader.c) + + target_link_libraries(gstgl + general ${OPENGL_LIBRARIES} + general ${GLEW_LIBRARY} + general ${GLIB2_LIBRARIES} + general ${GSTREAMER_LIBRARIES}) + + endif (APPLE) + endif (WIN32) diff --git a/gst/gl/CMakeLists.txt b/gst/gl/CMakeLists.txt old mode 100644 new mode 100755 index c8481b1..dec2e67 --- a/gst/gl/CMakeLists.txt +++ b/gst/gl/CMakeLists.txt @@ -22,7 +22,7 @@ if (WIN32) include_directories(AFTER ../../win32/common) endif (WIN32) -add_library (gstopengl SHARED +add_library (gstopengl MODULE gstopengl.c gstglimagesink.c gstglupload.c |