external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-02-12 13:51:55 +00:00
Code Issues Releases Wiki Activity

relay on PATH to find executables

Browse source
This commit is contained in:
albfan 2016-07-02 15:22:13 +02:00
parent c6d645d720
commit 4637409d0b
6 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -39,3 +39,4 @@ CMakeFiles/
cmake_install.cmake cmake_install.cmake
CMakeCache.txt CMakeCache.txt
libmiracle-shared.a libmiracle-shared.a
install_manifest.txt

33
CMakeLists.txt
View file

@ -1,28 +1,27 @@
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake
${CMAKE_MODULE_PATH})
set(CMAKE_C_FLAGS "-std=gnu11")
add_definitions(-D_GNU_SOURCE)
project(Miraclecast)
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(Miraclecast)
add_subdirectory(src)
add_subdirectory(res)
add_subdirectory(test)
SET(BUILD_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
OPTION(BUILD_ENABLE_DEBUG "Enable Debug" ON )
OPTION(RELY_UDEV "Rely in udev tag to select device" OFF )
OPTION(BUILD_TESTS "Enable TEST" ON )
SET(PACKAGE_NAME miraclecast) SET(PACKAGE_NAME miraclecast)
SET(PACKAGE_VERSION 1) SET(PACKAGE_VERSION 1)
SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake
${CMAKE_MODULE_PATH})
set(CMAKE_C_FLAGS "-std=gnu11 ${CMAKE_C_FLAGS}")
add_definitions(-D_GNU_SOURCE)
OPTION(BUILD_ENABLE_DEBUG "Enable Debug" ON )
OPTION(RELY_UDEV "Rely in udev tag to select device" OFF )
OPTION(BUILD_TESTS "Enable TEST" ON )
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules (GLIB2 REQUIRED glib-2.0) pkg_check_modules (GLIB2 REQUIRED glib-2.0)
pkg_check_modules (UDEV REQUIRED libudev) pkg_check_modules (UDEV REQUIRED libudev)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
add_subdirectory(src)
add_subdirectory(res)
add_subdirectory(test)

3
common.am
View file

@ -10,8 +10,7 @@ AM_CFLAGS = -Wall \
AM_CPPFLAGS = -include $(top_builddir)/config.h \ AM_CPPFLAGS = -include $(top_builddir)/config.h \
-I $(top_srcdir)/src \ -I $(top_srcdir)/src \
-I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/shared
'-DBUILD_BINDIR="$(bindir)"'
AM_LDFLAGS = -Wl,--as-needed \ AM_LDFLAGS = -Wl,--as-needed \
-Wl,--gc-sections \ -Wl,--gc-sections \

1
src/ctl/ctl.h
View file

@ -186,6 +186,7 @@ void cli_printf(const char *fmt, ...);
#define CLI_BLUE "\x1B[0;94m" #define CLI_BLUE "\x1B[0;94m"
#define CLI_BOLDGRAY "\x1B[1;30m" #define CLI_BOLDGRAY "\x1B[1;30m"
#define CLI_BOLDWHITE "\x1B[1;37m" #define CLI_BOLDWHITE "\x1B[1;37m"
#define CLI_PROMPT CLI_BLUE "[miraclectl] # " CLI_DEFAULT #define CLI_PROMPT CLI_BLUE "[miraclectl] # " CLI_DEFAULT
struct cli_cmd { struct cli_cmd {

2
src/ctl/sinkctl.c
View file

@ -369,7 +369,7 @@ static void spawn_gst(int hres, int vres)
} }
i = 0; i = 0;
argv[i++] = (char*) BUILD_BINDIR "/miracle-gst.sh"; argv[i++] = (char*) "/miracle-gst.sh";
if (cli_max_sev >= 7) if (cli_max_sev >= 7)
argv[i++] = "-d 3"; argv[i++] = "-d 3";
if (gst_audio_en) if (gst_audio_en)

12
src/wifi/wifid-supplicant.c
View file

@ -386,7 +386,7 @@ static int supplicant_group_spawn_dhcp_server(struct supplicant_group *g,
} }
i = 0; i = 0;
argv[i++] = (char*) BUILD_BINDIR "/miracle-dhcp"; argv[i++] = (char*) "miracle-dhcp";
argv[i++] = "--server"; argv[i++] = "--server";
argv[i++] = "--prefix"; argv[i++] = "--prefix";
argv[i++] = prefix; argv[i++] = prefix;
@ -398,7 +398,9 @@ static int supplicant_group_spawn_dhcp_server(struct supplicant_group *g,
argv[i++] = commfd; argv[i++] = commfd;
argv[i] = NULL; argv[i] = NULL;
execve(argv[0], argv, environ); if (execvpe(argv[0], argv, environ)< 0) {
log_error("dhcp failed (%d): %m", errno);
}
_exit(1); _exit(1);
} }
@ -448,7 +450,7 @@ static int supplicant_group_spawn_dhcp_client(struct supplicant_group *g)
} }
i = 0; i = 0;
argv[i++] = (char*) BUILD_BINDIR "/miracle-dhcp"; argv[i++] = (char*) "miracle-dhcp";
argv[i++] = "--log-level"; argv[i++] = "--log-level";
argv[i++] = loglevel; argv[i++] = loglevel;
argv[i++] = "--netdev"; argv[i++] = "--netdev";
@ -457,7 +459,9 @@ static int supplicant_group_spawn_dhcp_client(struct supplicant_group *g)
argv[i++] = commfd; argv[i++] = commfd;
argv[i] = NULL; argv[i] = NULL;
execve(argv[0], argv, environ); if (execvpe(argv[0], argv, environ) < 0) {
log_error("dhcp failed (%d): %m", errno);
}
_exit(1); _exit(1);
} }