external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

Fix cmake compilation for new dispd daemon

Browse source
This commit is contained in:
albfan 2018-01-31 22:26:42 +01:00 • committed by Alberto Fanjul
parent 8b455e1ce4
commit 9df83ab7b2
3 changed files with 13 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
res/gstencoder.vala
View file

@ -320,8 +320,13 @@ internal class GstEncoder : DispdEncoder, GLib.Object
conn = yield Bus.get(BusType.SESSION); conn = yield Bus.get(BusType.SESSION);
conn.register_object(DispdEncoder.OBJECT_PATH, this as DispdEncoder); conn.register_object(DispdEncoder.OBJECT_PATH, this as DispdEncoder);
#if VALA_0_54
string bus_info = "%s\n%s".printf(conn.unique_name, string bus_info = "%s\n%s".printf(conn.unique_name,
BusType.get_address_sync(BusType.SESSION)); BusType.SESSION.get_address_sync ());
#else
string bus_info = "%s\n%s".printf(conn.unique_name,
BusType.SESSION.get_address_sync());
#endif
/* we are ready, tell parent how to communicate with us */ /* we are ready, tell parent how to communicate with us */
ssize_t r = Posix.write(3, (void *) bus_info.data, bus_info.length); ssize_t r = Posix.write(3, (void *) bus_info.data, bus_info.length);
if(0 > r) { if(0 > r) {

37
src/ctl/CMakeLists.txt
View file

@ -3,8 +3,6 @@ pkg_check_modules (GLIB2 REQUIRED glib-2.0)
link_directories( ${GLIB2_LIBRARY_DIRS}) link_directories( ${GLIB2_LIBRARY_DIRS})
include_directories( ${GLIB2_INCLUDE_DIRS}) include_directories( ${GLIB2_INCLUDE_DIRS})
find_package(Readline REQUIRED) find_package(Readline REQUIRED)
pkg_check_modules (GLIB2 REQUIRED glib-2.0)
########### next target ###############
set(miracle-wifictl_SRCS ctl.h set(miracle-wifictl_SRCS ctl.h
ctl-cli.c ctl-cli.c
@ -25,7 +23,6 @@ endif(READLINE_FOUND)
target_link_libraries(miracle-wifictl miracle-shared) target_link_libraries(miracle-wifictl miracle-shared)
target_link_libraries(miracle-wifictl ${GLIB2_LIBRARIES}) target_link_libraries(miracle-wifictl ${GLIB2_LIBRARIES})
########### next target ###############
set(miracle-sinkctl_SRCS ctl.h set(miracle-sinkctl_SRCS ctl.h
ctl-cli.c ctl-cli.c
@ -52,37 +49,3 @@ target_link_libraries(miracle-sinkctl miracle-shared)
include_directories(${CMAKE_BINARY_DIR} include_directories(${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared) ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared)
#original Makefile.am contents follow:
#include $(top_srcdir)/common.am
#bin_PROGRAMS = miracle-wifictl miracle-sinkctl
#
#miracle_wifictl_SOURCES = \
# ctl.h \
# ctl-cli.c \
# ctl-wifi.c \
# wifictl.c
#miracle_wifictl_CPPFLAGS = \
# $(AM_CPPFLAGS) \
# $(DEPS_CFLAGS)
#miracle_wifictl_LDADD = \
# ../shared/libmiracle-shared.la \
# -lreadline \
# $(DEPS_LIBS)
#
#miracle_sinkctl_SOURCES = \
# ctl.h \
# ctl-cli.c \
# ctl-sink.c \
# ctl-wifi.c \
# sinkctl.c
#miracle_sinkctl_CPPFLAGS = \
# $(AM_CPPFLAGS) \
# $(DEPS_CFLAGS)
#miracle_sinkctl_LDADD = \
# ../shared/libmiracle-shared.la \
# -lreadline \
# $(DEPS_LIBS)
#
#

7
src/disp/CMakeLists.txt
View file

@ -1,3 +1,9 @@
find_package(PkgConfig)
pkg_check_modules (GLIB2 REQUIRED glib-2.0)
link_directories( ${GLIB2_LIBRARY_DIRS})
include_directories( ${GLIB2_INCLUDE_DIRS})
find_package(Readline REQUIRED)
set(miracle-dispd_SRCS set(miracle-dispd_SRCS
../ctl/ctl-cli.c ../ctl/ctl-cli.c
../ctl/ctl-wifi.c ../ctl/ctl-wifi.c
@ -18,6 +24,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/ctl
) )
add_executable(miracle-dispd ${miracle-dispd_SRCS}) add_executable(miracle-dispd ${miracle-dispd_SRCS})
target_link_libraries(miracle-dispd ${GLIB2_LIBRARIES})
install(TARGETS miracle-dispd DESTINATION bin) install(TARGETS miracle-dispd DESTINATION bin)