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

Merge pull request #700 from FreeRDP/cleanup

Browse Source 
CMake Cleanup
This commit is contained in:
Marc-André Moreau 2012-08-14 17:21:17 -07:00
commit 48392a4dad
411 changed files with 2032 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -55,7 +55,7 @@ endif()
# Default to build shared libs
if(NOT DEFINED BUILD_SHARED_LIBS)
set(BUILD_SHARED_LIBS ON)
set(BUILD_SHARED_LIBS ON)
endif()
# Compiler-specific flags
@ -95,6 +95,23 @@ if(MSVC)
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
endif()
# This forces the MSVC runtime to be statically linked
if(MSVC)
foreach(flag_var CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RELWITHDEBINFO)
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
string(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}")
endforeach(flag_var)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" CACHE STRING "MSVC C Debug MT flags " FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "MSVC CXX Debug MT flags " FORCE)
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "MSVC C Release MT flags " FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "MSVC CXX Release MT flags " FORCE)
set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}" CACHE STRING "MSVC C Debug MT flags " FORCE)
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}" CACHE STRING "MSVC C Release MT flags " FORCE)
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}" CACHE STRING "MSVC CXX Debug MT flags " FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CACHE STRING "MSVC CXX Release MT flags " FORCE)
endif()
# config.h definition for installable headers
check_include_files(limits.h FREERDP_HAVE_LIMITS_H)
check_include_files(stdint.h FREERDP_HAVE_STDINT_H)
@ -108,6 +125,9 @@ check_include_files(limits.h HAVE_LIMITS_H)
check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(stdbool.h HAVE_STDBOOL_H)
check_include_files(inttypes.h HAVE_INTTYPES_H)
check_include_files(sys/modem.h HAVE_SYS_MODEM_H)
check_include_files(sys/filio.h HAVE_SYS_FILIO_H)
check_include_files(sys/strtio.h HAVE_SYS_STRTIO_H)
check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
@ -159,13 +179,17 @@ set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp
set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp/extensions")
# Include directories
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
include_directories(${CMAKE_SOURCE_DIR}/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
# WinPR
set(WINPR_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/winpr/include")
include_directories(${WINPR_INCLUDE_DIR})
# Configure files
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/freerdp/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/freerdp/config.h)
add_definitions("-DHAVE_CONFIG_H")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/freerdp/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/freerdp/config.h)
# Generate pkg-config
if(NOT MSVC)
@ -181,19 +205,12 @@ if(WITH_CUNIT)
endif()
# Sub-directories
add_subdirectory(include)
add_subdirectory(libfreerdp-utils)
add_subdirectory(winpr)
add_subdirectory(libfreerdp-gdi)
add_subdirectory(libfreerdp-rail)
add_subdirectory(libfreerdp-cache)
add_subdirectory(libfreerdp-codec)
add_subdirectory(libfreerdp-crypto)
add_subdirectory(libfreerdp-channels)
add_subdirectory(libfreerdp-locale)
add_subdirectory(libfreerdp-core)
add_subdirectory(libfreerdp)
if(WITH_CHANNELS)
add_subdirectory(channels)
@ -222,4 +239,3 @@ string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_lower)
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME_lower}-${FREERDP_VERSION_FULL}")
include(CPack)

9
channels/cliprdr/CMakeLists.txt
View File

@ -22,12 +22,15 @@ set(CLIPRDR_SRCS
cliprdr_format.c
cliprdr_format.h
cliprdr_main.c
cliprdr_main.h
)
cliprdr_main.h)
add_library(cliprdr ${CLIPRDR_SRCS})
set_target_properties(cliprdr PROPERTIES PREFIX "")
target_link_libraries(cliprdr freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(cliprdr freerdp)
else()
target_link_libraries(cliprdr freerdp-utils)
endif()
install(TARGETS cliprdr DESTINATION ${FREERDP_PLUGIN_PATH})

4
channels/cliprdr/cliprdr_format.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

3
channels/cliprdr/cliprdr_main.c
View File

@ -18,7 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

6
channels/drdynvc/CMakeLists.txt
View File

@ -28,7 +28,11 @@ set(DRDYNVC_SRCS
add_library(drdynvc ${DRDYNVC_SRCS})
set_target_properties(drdynvc PROPERTIES PREFIX "")
target_link_libraries(drdynvc freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(drdynvc freerdp)
else()
target_link_libraries(drdynvc freerdp-utils)
endif()
install(TARGETS drdynvc DESTINATION ${FREERDP_PLUGIN_PATH})

9
channels/drdynvc/audin/CMakeLists.txt
View File

@ -19,15 +19,18 @@
set(AUDIN_SRCS
audin_main.c
audin_main.h
)
audin_main.h)
include_directories(..)
add_library(audin ${AUDIN_SRCS})
set_target_properties(audin PROPERTIES PREFIX "")
target_link_libraries(audin freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(audin freerdp)
else()
target_link_libraries(audin freerdp-utils)
endif()
install(TARGETS audin DESTINATION ${FREERDP_PLUGIN_PATH})

10
channels/drdynvc/audin/alsa/CMakeLists.txt
View File

@ -18,8 +18,7 @@
# limitations under the License.
set(AUDIN_ALSA_SRCS
audin_alsa.c
)
audin_alsa.c)
include_directories(..)
include_directories(${ALSA_INCLUDE_DIRS})
@ -27,7 +26,12 @@ include_directories(${ALSA_INCLUDE_DIRS})
add_library(audin_alsa ${AUDIN_ALSA_SRCS})
set_target_properties(audin_alsa PROPERTIES PREFIX "")
target_link_libraries(audin_alsa freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(audin_alsa freerdp)
else()
target_link_libraries(audin_alsa freerdp-utils)
endif()
target_link_libraries(audin_alsa ${ALSA_LIBRARIES})
install(TARGETS audin_alsa DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/drdynvc/audin/alsa/audin_alsa.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <alsa/asoundlib.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/thread.h>

5
channels/drdynvc/audin/audin_main.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/load_plugin.h>

7
channels/drdynvc/audin/pulse/CMakeLists.txt
View File

@ -27,7 +27,12 @@ include_directories(${PULSEAUDIO_INCLUDE_DIR})
add_library(audin_pulse ${AUDIN_PULSE_SRCS})
set_target_properties(audin_pulse PROPERTIES PREFIX "")
target_link_libraries(audin_pulse freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(audin_pulse freerdp)
else()
target_link_libraries(audin_pulse freerdp-utils)
endif()
target_link_libraries(audin_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS audin_pulse DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/drdynvc/audin/pulse/audin_pulse.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pulse/pulseaudio.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>

5
channels/drdynvc/drdynvc_main.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/constants.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>

3
channels/drdynvc/drdynvc_types.h
View File

@ -20,7 +20,10 @@
#ifndef __DRDYNVC_TYPES_H
#define __DRDYNVC_TYPES_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/dvc.h>
#include <freerdp/types.h>
#include <freerdp/utils/debug.h>

5
channels/drdynvc/dvcman.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/list.h>

9
channels/drdynvc/tsmf/CMakeLists.txt
View File

@ -32,15 +32,18 @@ set(TSMF_SRCS
tsmf_main.h
tsmf_media.c
tsmf_media.h
tsmf_types.h
)
tsmf_types.h)
include_directories(..)
add_library(tsmf ${TSMF_SRCS})
set_target_properties(tsmf PROPERTIES PREFIX "")
target_link_libraries(tsmf freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(tsmf freerdp)
else()
target_link_libraries(tsmf freerdp-utils)
endif()
install(TARGETS tsmf DESTINATION ${FREERDP_PLUGIN_PATH})

7
channels/drdynvc/tsmf/alsa/CMakeLists.txt
View File

@ -27,7 +27,12 @@ include_directories(${ALSA_INCLUDE_DIRS})
add_library(tsmf_alsa ${TSMF_ALSA_SRCS})
set_target_properties(tsmf_alsa PROPERTIES PREFIX "")
target_link_libraries(tsmf_alsa freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(tsmf_alsa freerdp)
else()
target_link_libraries(tsmf_alsa freerdp-utils)
endif()
target_link_libraries(tsmf_alsa ${ALSA_LIBRARIES})
install(TARGETS tsmf_alsa DESTINATION ${FREERDP_PLUGIN_PATH})

4
channels/drdynvc/tsmf/alsa/tsmf_alsa.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

7
channels/drdynvc/tsmf/ffmpeg/CMakeLists.txt
View File

@ -34,7 +34,12 @@ if(CMAKE_COMPILER_IS_GNUCC)
endif()
endif()
target_link_libraries(tsmf_ffmpeg freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(tsmf_ffmpeg freerdp)
else()
target_link_libraries(tsmf_ffmpeg freerdp-utils)
endif()
target_link_libraries(tsmf_ffmpeg ${FFMPEG_LIBRARIES})
install(TARGETS tsmf_ffmpeg DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/event.h>
#include <freerdp/plugins/tsmf.h>

7
channels/drdynvc/tsmf/gstreamer/CMakeLists.txt
View File

@ -27,7 +27,12 @@ include_directories(${GSTREAMER_INCLUDE_DIRS})
add_library(tsmf_gstreamer ${TSMF_GSTREAMER_SRCS})
set_target_properties(tsmf_gstreamer PROPERTIES PREFIX "")
target_link_libraries(tsmf_gstreamer freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(tsmf_gstreamer freerdp)
else()
target_link_libraries(tsmf_gstreamer freerdp-utils)
endif()
target_link_libraries(tsmf_gstreamer ${GSTREAMER_LIBRARIES} gstapp-0.10 gstinterfaces-0.10 Xrandr X11 Xext)
install(TARGETS tsmf_gstreamer DESTINATION ${FREERDP_PLUGIN_PATH})

4
channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
#include <X11/extensions/shape.h>

10
channels/drdynvc/tsmf/pulse/CMakeLists.txt
View File

@ -18,8 +18,7 @@
# limitations under the License.
set(TSMF_PULSE_SRCS
tsmf_pulse.c
)
tsmf_pulse.c)
include_directories(..)
include_directories(${PULSEAUDIO_INCLUDE_DIR})
@ -27,8 +26,11 @@ include_directories(${PULSEAUDIO_INCLUDE_DIR})
add_library(tsmf_pulse ${TSMF_PULSE_SRCS})
set_target_properties(tsmf_pulse PROPERTIES PREFIX "")
target_link_libraries(tsmf_pulse freerdp-utils)
target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY})
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY} freerdp)
else()
target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY} freerdp-utils)
endif()
install(TARGETS tsmf_pulse DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/drdynvc/tsmf/pulse/tsmf_pulse.c
View File

@ -17,10 +17,15 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <pulse/pulseaudio.h>
#include <freerdp/utils/memory.h>

5
channels/drdynvc/tsmf/tsmf_audio.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/load_plugin.h>

5
channels/drdynvc/tsmf/tsmf_codec.c
View File

@ -18,9 +18,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/hexdump.h>

5
channels/drdynvc/tsmf/tsmf_decoder.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/load_plugin.h>

5
channels/drdynvc/tsmf/tsmf_ifman.c
View File

@ -18,9 +18,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>

5
channels/drdynvc/tsmf/tsmf_main.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>

4
channels/drdynvc/tsmf/tsmf_media.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

6
channels/rail/CMakeLists.txt
View File

@ -26,7 +26,11 @@ set(RAIL_SRCS
add_library(rail ${RAIL_SRCS})
set_target_properties(rail PROPERTIES PREFIX "")
target_link_libraries(rail freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(rail freerdp)
else()
target_link_libraries(rail freerdp-utils)
endif()
install(TARGETS rail DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/rail/rail_main.c
View File

@ -19,9 +19,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/constants.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>

4
channels/rail/rail_orders.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/utils/rail.h>
#include <freerdp/utils/memory.h>

6
channels/rdpdbg/CMakeLists.txt
View File

@ -24,6 +24,10 @@ set(RDPDBG_SRCS
add_library(rdpdbg ${RDPDBG_SRCS})
set_target_properties(rdpdbg PROPERTIES PREFIX "")
target_link_libraries(rdpdbg freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(rdpdbg freerdp)
else()
target_link_libraries(rdpdbg freerdp-utils)
endif()
install(TARGETS rdpdbg DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/rdpdbg/rdpdbg_main.c
View File

@ -18,9 +18,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/constants.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>

9
channels/rdpdr/CMakeLists.txt
View File

@ -27,13 +27,16 @@ set(RDPDR_SRCS
irp.c
irp.h
rdpdr_main.c
rdpdr_main.h
)
rdpdr_main.h)
add_library(rdpdr ${RDPDR_SRCS})
set_target_properties(rdpdr PROPERTIES PREFIX "")
target_link_libraries(rdpdr freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(rdpdr freerdp)
else()
target_link_libraries(rdpdr freerdp-utils)
endif()
install(TARGETS rdpdr DESTINATION ${FREERDP_PLUGIN_PATH})

4
channels/rdpdr/devman.c
View File

@ -18,10 +18,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>

9
channels/rdpdr/disk/CMakeLists.txt
View File

@ -20,14 +20,17 @@
set(DISK_SRCS
disk_file.c
disk_file.h
disk_main.c
)
disk_main.c)
include_directories(..)
add_library(disk ${DISK_SRCS})
set_target_properties(disk PROPERTIES PREFIX "")
target_link_libraries(disk freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(disk freerdp)
else()
target_link_libraries(disk freerdp-utils)
endif()
install(TARGETS disk DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/rdpdr/disk/disk_file.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef _WIN32
#define __USE_LARGEFILE64
#define _LARGEFILE_SOURCE
@ -26,7 +30,6 @@
#include <sys/time.h>
#endif
#include "config.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>

7
channels/rdpdr/disk/disk_main.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef _WIN32
#define __USE_LARGEFILE64
#define _LARGEFILE_SOURCE
@ -26,12 +30,11 @@
#include <sys/time.h>
#endif
#include "config.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>

3
channels/rdpdr/irp.c
View File

@ -18,7 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

6
channels/rdpdr/parallel/CMakeLists.txt
View File

@ -26,6 +26,10 @@ include_directories(..)
add_library(parallel ${PARALLEL_SRCS})
set_target_properties(parallel PROPERTIES PREFIX "")
target_link_libraries(parallel freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(parallel freerdp)
else()
target_link_libraries(parallel freerdp-utils)
endif()
install(TARGETS parallel DESTINATION ${FREERDP_PLUGIN_PATH})

4
channels/rdpdr/parallel/parallel_main.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

13
channels/rdpdr/printer/CMakeLists.txt
View File

@ -19,15 +19,14 @@
set(PRINTER_SRCS
printer_main.c
printer_main.h
)
printer_main.h)
if(WITH_CUPS)
set(PRINTER_SRCS
${PRINTER_SRCS}
printer_cups.c
printer_cups.h
)
printer_cups.h)
include_directories(${CUPS_INCLUDE_DIR})
add_definitions(-DWITH_CUPS)
endif()
@ -37,7 +36,11 @@ include_directories(..)
add_library(printer ${PRINTER_SRCS})
set_target_properties(printer PROPERTIES PREFIX "")
target_link_libraries(printer freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(printer freerdp)
else()
target_link_libraries(printer freerdp-utils)
endif()
if(WITH_CUPS)
target_link_libraries(printer ${CUPS_LIBRARIES})

6
channels/rdpdr/printer/printer_cups.c
View File

@ -17,12 +17,18 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <time.h>
#include <cups/cups.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/svc_plugin.h>

4
channels/rdpdr/printer/printer_main.c
View File

@ -17,10 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
#include <freerdp/utils/memory.h>

4
channels/rdpdr/rdpdr_capabilities.c
View File

@ -18,10 +18,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/svc_plugin.h>

4
channels/rdpdr/rdpdr_main.c
View File

@ -18,10 +18,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/constants.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>

1
channels/rdpdr/rdpdr_types.h
View File

@ -21,7 +21,6 @@
#ifndef __RDPDR_TYPES_H
#define __RDPDR_TYPES_H
#include "config.h"
#include <freerdp/utils/stream.h>
#include <freerdp/utils/list.h>
#include <freerdp/utils/svc_plugin.h>

9
channels/rdpdr/serial/CMakeLists.txt
View File

@ -21,14 +21,17 @@ set(serial_SRCS
serial_tty.c
serial_tty.h
serial_constants.h
serial_main.c
)
serial_main.c)
include_directories(..)
add_library(serial ${serial_SRCS})
set_target_properties(serial PROPERTIES PREFIX "")
target_link_libraries(serial freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(serial freerdp)
else()
target_link_libraries(serial freerdp-utils)
endif()
install(TARGETS serial DESTINATION ${FREERDP_PLUGIN_PATH})

6
channels/rdpdr/serial/serial_main.c
View File

@ -18,13 +18,15 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "config.h"
#ifdef HAVE_SYS_MODEM_H
#include <sys/modem.h>
#endif

5
channels/rdpdr/serial/serial_tty.c
View File

@ -18,10 +18,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>
@ -70,7 +74,6 @@
#define TIOCOUTQ FIONWRITE
#endif
static uint32 tty_write_data(SERIAL_TTY* tty, uint8* data, int len);
static void tty_set_termios(SERIAL_TTY* tty);
static boolean tty_get_termios(SERIAL_TTY* tty);

7
channels/rdpdr/smartcard/CMakeLists.txt
View File

@ -28,7 +28,12 @@ include_directories(${PCSC_INCLUDE_DIRS})
add_library(scard ${SCARD_SRCS})
set_target_properties(scard PROPERTIES PREFIX "")
target_link_libraries(scard freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(scard freerdp)
else()
target_link_libraries(scard freerdp-utils)
endif()
target_link_libraries(scard ${PCSC_LIBRARIES})
install(TARGETS scard DESTINATION ${FREERDP_PLUGIN_PATH})

43
channels/rdpdr/smartcard/scard_main.c
View File

@ -1,25 +1,27 @@
/*
FreeRDP: A Remote Desktop Protocol client.
Redirected Smart Card Device Service
Copyright 2011 O.S. Systems Software Ltda.
Copyright 2011 Eduardo Fiss Beloni <beloni@ossystems.com.br>
Copyright 2011 Anthony Tong <atong@trustedcs.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
/**
* FreeRDP: A Remote Desktop Protocol client.
* Smartcard Device Service Virtual Channel
*
* Copyright 2011 O.S. Systems Software Ltda.
* Copyright 2011 Eduardo Fiss Beloni <beloni@ossystems.com.br>
* Copyright 2011 Anthony Tong <atong@trustedcs.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
@ -36,7 +38,6 @@
#include "scard_main.h"
static void
scard_free(DEVICE* dev)
{

38
channels/rdpdr/smartcard/scard_main.h
View File

@ -1,22 +1,22 @@
/*
FreeRDP: A Remote Desktop Protocol client.
Redirected Smart Card Device Service
Copyright 2011 O.S. Systems Software Ltda.
Copyright 2011 Eduardo Fiss Beloni <beloni@ossystems.com.br>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
/**
* FreeRDP: A Remote Desktop Protocol client.
* Smartcard Device Service Virtual Channel
*
* Copyright 2011 O.S. Systems Software Ltda.
* Copyright 2011 Eduardo Fiss Beloni <beloni@ossystems.com.br>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef __SCARD_MAIN_H
#define __SCARD_MAIN_H

42
channels/rdpdr/smartcard/scard_operations.c
View File

@ -1,25 +1,27 @@
/*
FreeRDP: A Remote Desktop Protocol client.
Redirected Smart Card Device Service
Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006
Copyright 2011 O.S. Systems Software Ltda.
Copyright 2011 Anthony Tong <atong@trustedcs.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
/**
* FreeRDP: A Remote Desktop Protocol client.
* Smartcard Device Service Virtual Channel
*
* Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006
* Copyright 2011 O.S. Systems Software Ltda.
* Copyright 2011 Anthony Tong <atong@trustedcs.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>

9
channels/rdpsnd/CMakeLists.txt
View File

@ -19,13 +19,16 @@
set(RDPSND_SRCS
rdpsnd_main.c
rdpsnd_main.h
)
rdpsnd_main.h)
add_library(rdpsnd ${RDPSND_SRCS})
set_target_properties(rdpsnd PROPERTIES PREFIX "")
target_link_libraries(rdpsnd freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(rdpsnd freerdp)
else()
target_link_libraries(rdpsnd freerdp-utils)
endif()
install(TARGETS rdpsnd DESTINATION ${FREERDP_PLUGIN_PATH})

7
channels/rdpsnd/alsa/CMakeLists.txt
View File

@ -27,7 +27,12 @@ include_directories(${ALSA_INCLUDE_DIRS})
add_library(rdpsnd_alsa ${RDPSND_ALSA_SRCS})
set_target_properties(rdpsnd_alsa PROPERTIES PREFIX "")
target_link_libraries(rdpsnd_alsa freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(rdpsnd_alsa freerdp)
else()
target_link_libraries(rdpsnd_alsa freerdp-utils)
endif()
target_link_libraries(rdpsnd_alsa ${ALSA_LIBRARIES})
install(TARGETS rdpsnd_alsa DESTINATION ${FREERDP_PLUGIN_PATH})

6
channels/rdpsnd/alsa/rdpsnd_alsa.c
View File

@ -18,10 +18,16 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <alsa/asoundlib.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/dsp.h>

10
channels/rdpsnd/mac_audio/CMakeLists.txt
View File

@ -19,8 +19,7 @@
# limitations under the License.
set(RDPSND_MACAUDIO_SRCS
rdpsnd_audio_q.c
)
rdpsnd_audio_q.c)
include_directories(..)
include_directories(${MACAUDIO_INCLUDE_DIRS})
@ -28,7 +27,12 @@ include_directories(${MACAUDIO_INCLUDE_DIRS})
add_library(rdpsnd_macaudio ${RDPSND_MACAUDIO_SRCS})
set_target_properties(rdpsnd_macaudio PROPERTIES PREFIX "")
target_link_libraries(rdpsnd_macaudio freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(rdpsnd_macaudio freerdp)
else()
target_link_libraries(rdpsnd_macaudio freerdp-utils)
endif()
target_link_libraries(rdpsnd_macaudio ${MAC_AUDIOTOOLBOX_LIBRARY_PATH})
target_link_libraries(rdpsnd_macaudio ${MAC_COREFOUNDATION_LIBRARY_PATH})

6
channels/rdpsnd/mac_audio/rdpsnd_audio_q.c
View File

@ -21,13 +21,19 @@
* Use AudioQueue to implement audio redirection
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/dsp.h>
#include <freerdp/utils/svc_plugin.h>
#include <AudioToolbox/AudioToolbox.h>
#include <AudioToolbox/AudioQueue.h>

10
channels/rdpsnd/pulse/CMakeLists.txt
View File

@ -18,8 +18,7 @@
# limitations under the License.
set(RDPSND_PULSE_SRCS
rdpsnd_pulse.c
)
rdpsnd_pulse.c)
include_directories(..)
include_directories(${PULSEAUDIO_INCLUDE_DIR})
@ -27,7 +26,12 @@ include_directories(${PULSEAUDIO_INCLUDE_DIR})
add_library(rdpsnd_pulse ${RDPSND_PULSE_SRCS})
set_target_properties(rdpsnd_pulse PROPERTIES PREFIX "")
target_link_libraries(rdpsnd_pulse freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(rdpsnd_pulse freerdp)
else()
target_link_libraries(rdpsnd_pulse freerdp-utils)
endif()
target_link_libraries(rdpsnd_pulse ${PULSEAUDIO_LIBRARY})
install(TARGETS rdpsnd_pulse DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/rdpsnd/pulse/rdpsnd_pulse.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pulse/pulseaudio.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>

5
channels/rdpsnd/rdpsnd_main.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef _WIN32
#include <sys/time.h>
#endif
@ -25,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/constants.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>

9
channels/skel/CMakeLists.txt
View File

@ -19,12 +19,15 @@
set(SKEL_SRCS
skel_main.c
skel_main.h
)
skel_main.h)
add_library(skel ${SKEL_SRCS})
set_target_properties(skel PROPERTIES PREFIX "")
target_link_libraries(skel freerdp-utils)
if(WITH_MONOLITHIC_BUILD)
target_link_libraries(skel freerdp)
else()
target_link_libraries(skel freerdp-utils)
endif()
install(TARGETS skel DESTINATION ${FREERDP_PLUGIN_PATH})

5
channels/skel/skel_main.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef _WIN32
#include <sys/time.h>
#endif
@ -25,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/constants.h>
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>

23
client/DirectFB/CMakeLists.txt
View File

@ -19,7 +19,7 @@
include_directories(${DIRECTFB_INCLUDE_DIRS})
add_executable(dfreerdp
set(FREERDP_CLIENT_DIRECTFB_SRCS
df_event.c
df_event.h
df_graphics.c
@ -27,11 +27,20 @@ add_executable(dfreerdp
dfreerdp.c
dfreerdp.h)
target_link_libraries(dfreerdp freerdp-core)
target_link_libraries(dfreerdp freerdp-gdi)
target_link_libraries(dfreerdp freerdp-locale)
target_link_libraries(dfreerdp freerdp-channels)
target_link_libraries(dfreerdp freerdp-utils)
target_link_libraries(dfreerdp ${DIRECTFB_LIBRARIES})
add_executable(dfreerdp ${FREERDP_CLIENT_DIRECTFB_SRCS})
set(FREERDP_CLIENT_DIRECTFB_LIBS ${DIRECTFB_LIBRARIES})
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_CLIENT_DIRECTFB_LIBS ${FREERDP_CLIENT_DIRECTFB_LIBS} freerdp)
else()
set(FREERDP_CLIENT_DIRECTFB_LIBS ${FREERDP_CLIENT_DIRECTFB_LIBS}
freerdp-core
freerdp-gdi
freerdp-locale
freerdp-channels
freerdp-utils)
endif()
target_link_libraries(dfreerdp ${FREERDP_CLIENT_DIRECTFB_LIBS})
install(TARGETS dfreerdp DESTINATION ${CMAKE_INSTALL_BINDIR})

24
client/Windows/CMakeLists.txt
View File

@ -1,9 +1,7 @@
# FreeRDP: A Remote Desktop Protocol Client
# FreeRDP Windows cmake build script
#
# Copyright 2011 O.S. Systems Software Ltda.
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -17,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
add_executable(wfreerdp WIN32
set(FREERDP_CLIENT_WINDOWS_SRCS
wf_gdi.c
wf_gdi.h
wf_event.c
@ -33,10 +31,18 @@ add_executable(wfreerdp WIN32
wfreerdp.c
wfreerdp.h)
target_link_libraries(wfreerdp freerdp-core)
target_link_libraries(wfreerdp freerdp-gdi)
target_link_libraries(wfreerdp freerdp-utils)
target_link_libraries(wfreerdp freerdp-codec)
target_link_libraries(wfreerdp freerdp-channels)
add_executable(wfreerdp WIN32 ${FREERDP_CLIENT_WINDOWS_SRCS})
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_CLIENT_WINDOWS_LIBS ${FREERDP_CLIENT_WINDOWS_LIBS} freerdp)
else()
set(FREERDP_CLIENT_WINDOWS_LIBS ${FREERDP_CLIENT_WINDOWS_LIBS}
freerdp-core
freerdp-gdi
freerdp-codec
freerdp-channels
freerdp-utils)
endif()
target_link_libraries(wfreerdp ${FREERDP_CLIENT_WINDOWS_LIBS})
install(TARGETS wfreerdp DESTINATION ${CMAKE_INSTALL_BINDIR})

4
client/Windows/wf_cliprdr.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/utils/event.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>

6
client/Windows/wf_event.c
View File

@ -19,8 +19,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <freerdp/freerdp.h>
#include "wfreerdp.h"
#include "wf_event.h"

4
client/Windows/wf_gdi.c
View File

@ -19,6 +19,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

6
client/Windows/wf_graphics.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/utils/memory.h>
#include <freerdp/codec/bitmap.h>
@ -157,7 +161,7 @@ void wf_Bitmap_Paint(rdpContext* context, rdpBitmap* bitmap)
}
void wf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap,
uint8* data, int width, int height, int bpp, int length, boolean compressed)
uint8* data, int width, int height, int bpp, int length, boolean compressed, int codec_id)
{
uint16 size;

4
client/Windows/wf_rail.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/utils/rail.h>

6
client/Windows/wf_window.c
View File

@ -17,4 +17,8 @@
* limitations under the License.
*/
#include "wf_window.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "wf_window.h"

4
client/Windows/wfreerdp.c
View File

@ -19,6 +19,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <winpr/windows.h>
#include <errno.h>

35
client/X11/CMakeLists.txt
View File

@ -20,7 +20,7 @@
include(FindXmlto)
include_directories(${X11_INCLUDE_DIRS})
add_executable(xfreerdp
set(FREERDP_CLIENT_X11_SRCS
xf_gdi.c
xf_gdi.h
xf_rail.c
@ -42,6 +42,12 @@ add_executable(xfreerdp
xfreerdp.c
xfreerdp.h)
add_executable(xfreerdp ${FREERDP_CLIENT_X11_SRCS})
set(FREERDP_CLIENT_X11_LIBS
${X11_LIBRARIES}
${CMAKE_DL_LIBS})
if(WITH_MANPAGES)
if(XMLTO_FOUND)
add_custom_command(OUTPUT xfreerdp.1
@ -61,38 +67,43 @@ find_suggested_package(Xinerama)
if(WITH_XINERAMA)
add_definitions(-DWITH_XINERAMA -DWITH_XEXT)
include_directories(${XINERAMA_INCLUDE_DIRS})
target_link_libraries(xfreerdp ${XINERAMA_LIBRARIES})
set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XINERAMA_LIBRARIES})
endif()
find_suggested_package(Xext)
if(WITH_XEXT)
add_definitions(-DWITH_XEXT)
include_directories(${XEXT_INCLUDE_DIRS})
target_link_libraries(xfreerdp ${XEXT_LIBRARIES})
set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XEXT_LIBRARIES})
endif()
find_suggested_package(Xcursor)
if(WITH_XCURSOR)
add_definitions(-DWITH_XCURSOR)
include_directories(${XCURSOR_INCLUDE_DIRS})
target_link_libraries(xfreerdp ${XCURSOR_LIBRARIES})
set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XCURSOR_LIBRARIES})
endif()
find_suggested_package(Xv)
if(WITH_XV)
add_definitions(-DWITH_XV)
include_directories(${XV_INCLUDE_DIRS})
target_link_libraries(xfreerdp ${XV_LIBRARIES})
set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XV_LIBRARIES})
endif()
include_directories(${CMAKE_SOURCE_DIR}/resources)
target_link_libraries(xfreerdp freerdp-core)
target_link_libraries(xfreerdp freerdp-gdi)
target_link_libraries(xfreerdp freerdp-locale)
target_link_libraries(xfreerdp freerdp-rail)
target_link_libraries(xfreerdp freerdp-channels)
target_link_libraries(xfreerdp freerdp-utils)
target_link_libraries(xfreerdp ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} freerdp)
else()
set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS}
freerdp-core
freerdp-gdi
freerdp-locale
freerdp-rail
freerdp-channels
freerdp-utils)
endif()
target_link_libraries(xfreerdp ${FREERDP_CLIENT_X11_LIBS})
install(TARGETS xfreerdp DESTINATION ${CMAKE_INSTALL_BINDIR})

5
client/X11/xf_cliprdr.c
View File

@ -17,9 +17,14 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/unicode.h>

4
client/X11/xf_event.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>

4
client/X11/xf_gdi.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>

4
client/X11/xf_graphics.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>

4
client/X11/xf_keyboard.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

4
client/X11/xf_monitor.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

15
client/X11/xf_rail.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@ -41,14 +45,13 @@ void xf_rail_enable_remoteapp_mode(xfInfo* xfi)
void xf_rail_disable_remoteapp_mode(xfInfo* xfi)
{
if (xfi->remote_app == true)
{
xfi->remote_app = false;
xf_create_window(xfi);
}
if (xfi->remote_app == true)
{
xfi->remote_app = false;
xf_create_window(xfi);
}
}
void xf_rail_paint(xfInfo* xfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 uright, uint32 ubottom)
{
xfWindow* xfw;

7
client/X11/xf_tsmf.c
View File

@ -17,15 +17,22 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/XShm.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/event.h>
#include <freerdp/plugins/tsmf.h>

7
client/X11/xf_window.c
View File

@ -18,13 +18,18 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdarg.h>
#include <unistd.h>
#include <sys/types.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <sys/types.h>
#include <sys/shm.h>
#include <sys/ipc.h>

4
client/X11/xf_window.h
View File

@ -105,10 +105,12 @@ void xf_UpdateWindowArea(xfInfo* xfi, xfWindow* window, int x, int y, int width,
boolean xf_IsWindowBorder(xfInfo* xfi, xfWindow* xfw, int x, int y);
void xf_DestroyWindow(xfInfo* xfi, xfWindow* window);
boolean xf_GetWindowProperty(xfInfo* xfi, Window window, Atom property, int length,
unsigned long* nitems, unsigned long* bytes, uint8** prop);
void xf_SetWindowMinMaxInfo(xfInfo* xfi, xfWindow* window, int maxWidth, int maxHeight,
int maxPosX, int maxPosY, int minTrackWidth, int minTrackHeight, int maxTrackWidth, int maxTrackHeight);
void xf_StartLocalMoveSize(xfInfo* xfi, xfWindow* window, int direction, int x, int y);
void xf_EndLocalMoveSize(xfInfo *xfi, xfWindow *window);
void xf_SendClientEvent(xfInfo *xfi, xfWindow* window, Atom atom, unsigned int numArgs, ...);

5
client/X11/xfreerdp.c
View File

@ -18,6 +18,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@ -40,6 +44,7 @@
#include <sys/wait.h>
#include <sys/types.h>
#include <sys/select.h>
#include <freerdp/constants.h>
#include <freerdp/codec/nsc.h>
#include <freerdp/codec/rfx.h>

4
client/X11/xfreerdp.h
View File

@ -20,7 +20,10 @@
#ifndef __XFREERDP_H
#define __XFREERDP_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/freerdp.h>
#include <freerdp/channels/channels.h>
#include <freerdp/gdi/gdi.h>
@ -165,6 +168,7 @@ struct xf_info
Atom WM_DELETE_WINDOW;
};
void xf_create_window(xfInfo* xfi);
void xf_toggle_fullscreen(xfInfo* xfi);
boolean xf_post_connect(freerdp* instance);

20
client/test/CMakeLists.txt
View File

@ -17,11 +17,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
add_executable(freerdp-test
set(FREERDP_CLIENT_TEST_SRCS
freerdp.c)
target_link_libraries(freerdp-test freerdp-core)
target_link_libraries(freerdp-test freerdp-gdi)
target_link_libraries(freerdp-test freerdp-utils)
target_link_libraries(freerdp-test freerdp-channels ${CMAKE_DL_LIBS})
add_executable(freerdp-test ${FREERDP_CLIENT_TEST_SRCS})
set(FREERDP_CLIENT_TEST_LIBS ${FREERDP_CLIENT_TEST_LIBS} ${CMAKE_DL_LIBS})
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_CLIENT_TEST_LIBS ${FREERDP_CLIENT_TEST_LIBS} freerdp)
else()
set(FREERDP_CLIENT_TEST_LIBS ${FREERDP_CLIENT_TEST_LIBS}
freerdp-core
freerdp-gdi
freerdp-utils
freerdp-channels)
endif()
target_link_libraries(freerdp-test ${FREERDP_CLIENT_TEST_LIBS})

4
client/test/freerdp.c
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef _WIN32
#include <unistd.h>
#include <pthread.h>

8
cmake/ConfigOptions.cmake
View File

@ -10,6 +10,14 @@ if(APPLE)
option(WITH_CLANG "Build using clang" OFF)
endif()
if(MSVC)
option(WITH_NATIVE_SSPI "Use native SSPI modules" ON)
endif()
if(${CMAKE_VERSION} VERSION_GREATER 2.8.8)
option(WITH_MONOLITHIC_BUILD "Use monolithic build" OFF)
endif()
option(WITH_CLIENT "Build client binaries" ON)
option(WITH_SERVER "Build server binaries" OFF)
option(WITH_CHANNELS "Build virtual channel plugins" ON)

3
config.h.in
View File

@ -19,6 +19,9 @@
#cmakedefine HAVE_STDINT_H
#cmakedefine HAVE_STDBOOL_H
#cmakedefine HAVE_INTTYPES_H
#cmakedefine HAVE_SYS_MODEM_H
#cmakedefine HAVE_SYS_FILIO_H
#cmakedefine HAVE_SYS_STRTIO_H
#cmakedefine HAVE_TM_GMTOFF

21
include/CMakeLists.txt
View File

@ -17,23 +17,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
file(GLOB HEADERS "freerdp/*.h")
install_files(/include/freerdp FILES ${HEADERS})
file(GLOB FREERDP_HEADERS "freerdp/*.h")
install(FILES ${FREERDP_HEADERS} DESTINATION include/freerdp)
install(DIRECTORY freerdp/utils DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/channels DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/cache DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/gdi DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/rail DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/channels DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/codec DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/plugins DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/locale DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/crypto DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/auth DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/gdi DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/locale DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/plugins DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/rail DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/server DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
install(DIRECTORY freerdp/utils DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
file(GLOB HEADERS "winpr/*.h")
install_files(/include/winpr FILES ${HEADERS})
file(GLOB HEADERS "${CMAKE_CURRENT_BINARY_DIR}/freerdp/*.h")
install_files(/include/freerdp FILES ${HEADERS})

50
libfreerdp/CMakeLists.txt Normal file
View File

@ -0,0 +1,50 @@
# FreeRDP: A Remote Desktop Protocol Client
# libfreerdp cmake build script
#
# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
if(WITH_MONOLITHIC_BUILD)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
add_subdirectory(utils)
add_subdirectory(gdi)
add_subdirectory(rail)
add_subdirectory(cache)
add_subdirectory(codec)
add_subdirectory(crypto)
add_subdirectory(channels)
add_subdirectory(locale)
add_subdirectory(core)
if(WITH_MONOLITHIC_BUILD)
add_library(freerdp
$<TARGET_OBJECTS:freerdp-utils>
$<TARGET_OBJECTS:freerdp-gdi>
$<TARGET_OBJECTS:freerdp-rail>
$<TARGET_OBJECTS:freerdp-cache>
$<TARGET_OBJECTS:freerdp-codec>
$<TARGET_OBJECTS:freerdp-crypto>
$<TARGET_OBJECTS:freerdp-channels>
$<TARGET_OBJECTS:freerdp-locale>
$<TARGET_OBJECTS:freerdp-core>)
set_target_properties(freerdp PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
target_link_libraries(freerdp ${FREERDP_LIBS})
install(TARGETS freerdp DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

20
libfreerdp-cache/CMakeLists.txt → libfreerdp/cache/CMakeLists.txt vendored
View File

@ -27,11 +27,23 @@ set(FREERDP_CACHE_SRCS
glyph.c
cache.c)
add_library(freerdp-cache ${FREERDP_CACHE_SRCS})
if(WITH_MONOLITHIC_BUILD)
add_library(freerdp-cache OBJECT ${FREERDP_CACHE_SRCS})
else()
add_library(freerdp-cache ${FREERDP_CACHE_SRCS})
endif()
set_target_properties(freerdp-cache PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
target_link_libraries(freerdp-cache freerdp-core)
target_link_libraries(freerdp-cache freerdp-utils)
set(FREERDP_CACHE_LIBS)
install(TARGETS freerdp-cache DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CACHE_LIBS} PARENT_SCOPE)
else()
set(FREERDP_CACHE_LIBS ${FREERDP_CACHE_LIBS}
freerdp-core
freerdp-utils)
target_link_libraries(freerdp-cache ${FREERDP_CACHE_LIBS})
install(TARGETS freerdp-cache DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

4
libfreerdp-cache/bitmap.c → libfreerdp/cache/bitmap.c vendored
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/freerdp.h>
#include <freerdp/constants.h>
#include <freerdp/utils/stream.h>

4
libfreerdp-cache/brush.c → libfreerdp/cache/brush.c vendored
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/update.h>
#include <freerdp/freerdp.h>
#include <freerdp/utils/stream.h>

4
libfreerdp-cache/cache.c → libfreerdp/cache/cache.c vendored
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>

4
libfreerdp-cache/glyph.c → libfreerdp/cache/glyph.c vendored
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/freerdp.h>
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>

4
libfreerdp-cache/nine_grid.c → libfreerdp/cache/nine_grid.c vendored
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/update.h>
#include <freerdp/freerdp.h>
#include <freerdp/utils/stream.h>

4
libfreerdp-cache/offscreen.c → libfreerdp/cache/offscreen.c vendored
View File

@ -17,6 +17,10 @@
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>

Some files were not shown because too many files have changed in this diff Show More