mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

channels: added build options to enabled/disable client and server channels

Browse Source
This commit is contained in:
Marc-André Moreau 2012-09-22 20:16:38 -04:00
parent e4e85be15d
commit 6cb933aa5a
15 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -170,6 +170,8 @@ set(FREERDP_KEYMAP_PATH "${FREERDP_DATA_PATH}/keymaps")
# Path to put plugins # Path to put plugins
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp") set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp")
set(FREERDP_CLIENT_PLUGIN_PATH "${FREERDP_PLUGIN_PATH}/client")
set(FREERDP_SERVER_PLUGIN_PATH "${FREERDP_PLUGIN_PATH}/server")
# Path to put extensions # Path to put extensions
set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions") set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions")

4
channels/CMakeLists.txt
View File

@ -30,5 +30,7 @@ foreach(FILEPATH ${FILEPATHS})
endif() endif()
endforeach(FILEPATH) endforeach(FILEPATH)
add_subdirectory(server) if(WITH_SERVER_CHANNELS)
add_subdirectory(server)
endif()

16
channels/audin/CMakeLists.txt
View File

@ -18,12 +18,14 @@
set(MODULE_NAME "audin") set(MODULE_NAME "audin")
set(MODULE_PREFIX "CHANNEL_AUDIN") set(MODULE_PREFIX "CHANNEL_AUDIN")
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
add_subdirectory(server) endif()
set(${MODULE_PREFIX}_SERVER_SRCS ${${MODULE_PREFIX}_SERVER_SRCS} PARENT_SCOPE)
set(${MODULE_PREFIX}_SERVER_LIBS ${${MODULE_PREFIX}_SERVER_LIBS} PARENT_SCOPE)
set(CHANNEL_BUILTIN_SERVER_MODULES ${CHANNEL_BUILTIN_SERVER_MODULES} ${MODULE_NAME} PARENT_SCOPE)
if(WITH_SERVER_CHANNELS)
add_subdirectory(server)
set(${MODULE_PREFIX}_SERVER_SRCS ${${MODULE_PREFIX}_SERVER_SRCS} PARENT_SCOPE)
set(${MODULE_PREFIX}_SERVER_LIBS ${${MODULE_PREFIX}_SERVER_LIBS} PARENT_SCOPE)
set(CHANNEL_BUILTIN_SERVER_MODULES ${CHANNEL_BUILTIN_SERVER_MODULES} ${MODULE_NAME} PARENT_SCOPE)
endif()

1
channels/audin/client/CMakeLists.txt
View File

@ -41,4 +41,3 @@ endif()
if(WITH_PULSEAUDIO) if(WITH_PULSEAUDIO)
add_subdirectory(pulse) add_subdirectory(pulse)
endif() endif()

4
channels/cliprdr/CMakeLists.txt
View File

@ -15,5 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
endif()

4
channels/drdynvc/CMakeLists.txt
View File

@ -15,5 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
endif()

4
channels/rail/CMakeLists.txt
View File

@ -15,5 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
endif()

4
channels/rdpdr/CMakeLists.txt
View File

@ -15,5 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
endif()

15
channels/rdpsnd/CMakeLists.txt
View File

@ -18,12 +18,15 @@
set(MODULE_NAME "rdpsnd") set(MODULE_NAME "rdpsnd")
set(MODULE_PREFIX "CHANNEL_RDPSND") set(MODULE_PREFIX "CHANNEL_RDPSND")
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
endif()
add_subdirectory(server) if(WITH_SERVER_CHANNELS)
add_subdirectory(server)
set(${MODULE_PREFIX}_SERVER_SRCS ${${MODULE_PREFIX}_SERVER_SRCS} PARENT_SCOPE) set(${MODULE_PREFIX}_SERVER_SRCS ${${MODULE_PREFIX}_SERVER_SRCS} PARENT_SCOPE)
set(${MODULE_PREFIX}_SERVER_LIBS ${${MODULE_PREFIX}_SERVER_LIBS} PARENT_SCOPE) set(${MODULE_PREFIX}_SERVER_LIBS ${${MODULE_PREFIX}_SERVER_LIBS} PARENT_SCOPE)
set(CHANNEL_BUILTIN_SERVER_MODULES ${CHANNEL_BUILTIN_SERVER_MODULES} ${MODULE_NAME} PARENT_SCOPE) set(CHANNEL_BUILTIN_SERVER_MODULES ${CHANNEL_BUILTIN_SERVER_MODULES} ${MODULE_NAME} PARENT_SCOPE)
endif()

4
channels/sample/CMakeLists.txt
View File

@ -15,5 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
endif()

1
channels/server/CMakeLists.txt
View File

@ -32,4 +32,3 @@ set_target_properties(freerdp-server PROPERTIES VERSION ${FREERDP_VERSION_FULL}
target_link_libraries(freerdp-server ${CHANNEL_SERVER_LIBS}) target_link_libraries(freerdp-server ${CHANNEL_SERVER_LIBS})
install(TARGETS freerdp-server DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS freerdp-server DESTINATION ${CMAKE_INSTALL_LIBDIR})

5
channels/tsmf/CMakeLists.txt
View File

@ -15,5 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
add_subdirectory(client) if(WITH_CLIENT_CHANNELS)
add_subdirectory(client)
endif()

9
cmake/ConfigOptions.cmake
View File

@ -22,6 +22,15 @@ endif()
option(WITH_CLIENT "Build client binaries" ON) option(WITH_CLIENT "Build client binaries" ON)
option(WITH_SERVER "Build server binaries" OFF) option(WITH_SERVER "Build server binaries" OFF)
option(WITH_CHANNELS "Build virtual channel plugins" ON) option(WITH_CHANNELS "Build virtual channel plugins" ON)
if(WITH_CLIENT AND WITH_CHANNELS)
option(WITH_CLIENT_CHANNELS "Build virtual channel plugins" ON)
endif()
if(WITH_SERVER AND WITH_CHANNELS)
option(WITH_SERVER_CHANNELS "Build virtual channel plugins" ON)
endif()
option(WITH_THIRD_PARTY "Build third-party components" OFF) option(WITH_THIRD_PARTY "Build third-party components" OFF)
option(WITH_SERVER_INTERFACE "Build server as a library with an interface" OFF) option(WITH_SERVER_INTERFACE "Build server as a library with an interface" OFF)

4
config.h.in
View File

@ -9,8 +9,10 @@
#define GIT_REVISION "${GIT_REVISION}" #define GIT_REVISION "${GIT_REVISION}"
#define FREERDP_DATA_PATH "${FREERDP_DATA_PATH}" #define FREERDP_DATA_PATH "${FREERDP_DATA_PATH}"
#define FREERDP_PLUGIN_PATH "${FREERDP_PLUGIN_PATH}"
#define FREERDP_KEYMAP_PATH "${FREERDP_KEYMAP_PATH}" #define FREERDP_KEYMAP_PATH "${FREERDP_KEYMAP_PATH}"
#define FREERDP_PLUGIN_PATH "${FREERDP_PLUGIN_PATH}"
#define FREERDP_CLIENT_PLUGIN_PATH "${FREERDP_CLIENT_PLUGIN_PATH}"
#define FREERDP_SERVER_PLUGIN_PATH "${FREERDP_SERVER_PLUGIN_PATH}"
/* Include files */ /* Include files */
#cmakedefine HAVE_FCNTL_H #cmakedefine HAVE_FCNTL_H

5
libfreerdp/utils/load_plugin.c
View File

@ -336,12 +336,13 @@ boolean freerdp_register_static_plugin(const char* name, const char* entry_name,
*/ */
void* freerdp_load_static_plugin(const char* name, const char* entry_name) void* freerdp_load_static_plugin(const char* name, const char* entry_name)
{ {
staticPlugin* plugin;
int i; int i;
staticPlugin* plugin;
for (i = 0; i < g_static_plugins_count; i++) for (i = 0; i < g_static_plugins_count; i++)
{ {
plugin = &g_static_plugins[i]; plugin = &g_static_plugins[i];
if (!strcmp(plugin->name, name) && !strcmp(plugin->entry_name, entry_name)) if (!strcmp(plugin->name, name) && !strcmp(plugin->entry_name, entry_name))
{ {
return plugin->entry_addr; return plugin->entry_addr;
@ -350,5 +351,3 @@ void* freerdp_load_static_plugin(const char* name, const char* entry_name)
return NULL; return NULL;
} }