Makefile.am: fix autotools compilation on macosx

parent 2f11e962
......@@ -281,7 +281,7 @@ if(ENABLE_VIDEO)
)
endif()
endif()
if(ENABLE_VT_H264 AND APPLE)
if(APPLE)
list(APPEND VOIP_SOURCE_FILES_C videofilters/videotoolbox.c)
endif()
if (ENABLE_QNX)
......
......@@ -232,18 +232,6 @@ libmediastreamer_voip_la_LIBADD+=libqtcapture_cocoa.la
nodist_libmediastreamer_voip_la_SOURCES = yuv2rgb.fs.h yuv2rgb.fs.h
endif
if BUILD_IOS
libmediastreamer_voip_la_SOURCES+= voip/scaler.c \
voip/ioshardware.m \
videofilters/iosdisplay.m \
videofilters/ioscapture.m \
utils/shaders.c \
utils/shaders.h \
utils/opengles_display.c \
utils/opengles_display.h
nodist_libmediastreamer_voip_la_SOURCES = yuv2rgb.fs.h yuv2rgb.fs.h
endif
if BUILD_V4L1
libmediastreamer_voip_la_SOURCES+= videofilters/msv4l.c
endif
......@@ -307,6 +295,7 @@ libmediastreamer_voip_la_SOURCES+= voip/rfc2429.h \
utils/bits_rw.c \
utils/x11_helper.c \
utils/stream_regulator.c utils/stream_regulator.h \
utils/h264utils.c utils/h264utils.h \
voip/layouts.c voip/layouts.h \
voip/video_preset_high_fps.c
......@@ -452,12 +441,11 @@ AM_CFLAGS+=$(LIBUPNP_CFLAGS) -D_GNU_SOURCE
libmediastreamer_voip_la_LIBADD+= $(LIBUPNP_LIBS)
endif
if BUILD_IOS
libmediastreamer_voip_la_LDFLAGS+= -framework CoreGraphics
endif
if BUILD_MACOSX
libmediastreamer_voip_la_LDFLAGS+= -framework Cocoa -framework OpenGL -framework QuartzCore
if BUILD_VIDEO
libmediastreamer_voip_la_LDFLAGS+= -framework VideoToolbox -framework CoreMedia
endif
endif
AM_OBJCFLAGS=$(AM_CFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment