mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-06 02:32:23 +00:00
[306/906] fix CMake build and frozen CodeBlocks build
This commit is contained in:
parent
e17c93723f
commit
4d4e3ad4f9
2 changed files with 27 additions and 12 deletions
|
@ -5,10 +5,13 @@ include_directories(AFTER
|
|||
.
|
||||
${GLEW_INCLUDE_DIR}
|
||||
${GSTREAMER_INCLUDE_DIR}
|
||||
${GLIB2_INCLUDE_DIR}
|
||||
${GLIB2_INCLUDE_DIR})
|
||||
|
||||
if (NOT GST_USING_BINARY_REGISTRY)
|
||||
include_directories(AFTER
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${LIBICONV_INCLUDE_DIR})
|
||||
|
||||
endif (NOT GST_USING_BINARY_REGISTRY)
|
||||
|
||||
if (WIN32)
|
||||
|
||||
|
|
|
@ -1,26 +1,39 @@
|
|||
add_definitions(-DHAVE_CONFIG_H)
|
||||
|
||||
if (PNG_FOUND)
|
||||
if (PNG_FOUND AND ZLIB_FOUND)
|
||||
add_definitions(-DHAVE_LIBPNG)
|
||||
endif (PNG_FOUND)
|
||||
include_directories(AFTER
|
||||
${PNG_INCLUDE_DIR}
|
||||
${ZLIB_INCLUDE_DIR})
|
||||
endif (PNG_FOUND AND ZLIB_FOUND)
|
||||
|
||||
include_directories(AFTER
|
||||
${GSTREAMER_INCLUDE_DIR}
|
||||
${GLIB2_INCLUDE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${LIBICONV_INCLUDE_DIR}
|
||||
${PNG_INCLUDE_DIR}
|
||||
../../gst-libs/gst/gl
|
||||
${GLEW_INCLUDE_DIR}
|
||||
../../gst-libs
|
||||
../..
|
||||
.
|
||||
effects)
|
||||
|
||||
if (NOT GST_USING_BINARY_REGISTRY)
|
||||
include_directories(AFTER
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${LIBICONV_INCLUDE_DIR})
|
||||
endif (NOT GST_USING_BINARY_REGISTRY)
|
||||
|
||||
if (WIN32)
|
||||
include_directories(AFTER ../../win32/common)
|
||||
endif (WIN32)
|
||||
|
||||
if (PNG_FOUND AND ZLIB_FOUND)
|
||||
set(OTHER_ELEMENTS
|
||||
gstglpixbufoverlay.c
|
||||
gstgldifferencematte.c
|
||||
gstglbumper.c)
|
||||
endif (PNG_FOUND AND ZLIB_FOUND)
|
||||
|
||||
add_library (gstopengl SHARED
|
||||
gstopengl.c
|
||||
gstglimagesink.c
|
||||
|
@ -36,10 +49,8 @@ add_library (gstopengl SHARED
|
|||
gstglcolorscale.c
|
||||
gltestsrc.c
|
||||
gstgltestsrc.c
|
||||
${OTHER_ELEMENTS}
|
||||
gstgleffects.c
|
||||
gstglpixbufoverlay.c
|
||||
gstgldifferencematte.c
|
||||
gstglbumper.c
|
||||
effects/gstgleffectssources.c
|
||||
effects/gstgleffectidentity.c
|
||||
effects/gstgleffectmirror.c
|
||||
|
@ -55,7 +66,8 @@ add_library (gstopengl SHARED
|
|||
effects/gstgleffectsin.c
|
||||
effects/gstgleffectglow.c
|
||||
effects/gstgleffectxray.c)
|
||||
|
||||
|
||||
target_link_libraries(gstopengl
|
||||
general gstgl
|
||||
general ${PNG_LIBRARY})
|
||||
general ${PNG_LIBRARY}
|
||||
general ${ZLIB_LIBRARY})
|
||||
|
|
Loading…
Reference in a new issue