Commit Graph

55 Commits

Author SHA1 Message Date
Martin Fleisz
705c0cf923 cmake: Fix wrong pdb name 2016-12-12 13:12:41 +01:00
Bernhard Miklautz
1ea3d4d9b7 wfreerdp: fix name build without client interface
When built without client-interface the binary should be called wfreerdp
as well (currently it is wfreerdp-client)
2016-05-12 11:47:10 +02:00
Bernhard Miklautz
2c0e73b075 client: disable the client interface per default
libxfreerdp-client doesn't necessarily provide a stable interface
therefore it isn't built and installed anymore per default.

To archive the same behavior as before this change -
libxfreerdp-client.so built and a library version set - use
-DWITH_CLIENT_INTERFACE=ON -DCLIENT_INTERFACE_SHARED=ON
when running cmake.

This also fixes the build on windows without WITH_CLIENT_INTERFACE
enabled.
2016-05-09 12:20:38 +02:00
Bernhard Miklautz
6fa3608111 cleanup cmake exports and pkg-config files
With this commit the "exported" components (usable with pkg-config and
cmake find module package)
* winpr - winpr library and headers
* freerdp - core library and headers
* freerdp-client - client specific library
* freerdp-server - server specific library
* rdtk - rdtk headers and library

To allow the installation of multiple different version (different major
number) the include files were moved into the respective sub folder:
freerdp -> freerdp{MAJOR}/freerdp (currently freerdp2/freerdp/)
winpr -> winpr{MAJOR}/winpr (currently winrp1/winpr/)
rdtk -> rdpk{MAJOR}/rdtk (currently rdtk0/rdtk/

The generated pkg-config and cmake find modules now also include the major
version number. Currently the following pkg-config are generated and
installed.
* winpr1
* freerdp2
* freerdp-server2
* freerdp-client2
* rdtk0

As cmake is able to handle multiple versions out of the box the
following can be used to find a specific module:

find_package(WinPR)
find_package(FreeRDP)
find_package(FreeRDP-Server)
find_package(FreeRDP-Client)
find_package(RdTk)

As cmake doesn't automatically resolve dependencies for packages it is
necessary to manually include the requirements. For example if
FreeRDP-Client is required WinPR and FreeRDP need to be included
(find_package) as well.

This commit also fixes the installation when STATIC_CHANNELS are built.
WITH STATIC_CHANNELS all channels are linked into libfreerdp-client, for
this all channels are generated as linker archive and linked together in
the final step. Before the intermediate linker archives were, although
not required and useful, installed. Same applies for server side
channels.
2016-01-12 17:32:33 +01:00
Armin Novak
6ed43cd6ec Updated pdb file locations.
Now supporting generators NMake and Visual Studio.
2015-12-15 12:08:35 +01:00
Armin Novak
cb958ba9c6 Added pdb files to package target.
Fixed name collision with freerdp-shadow targets.
2015-12-15 12:07:21 +01:00
Norbert Federa
bd345ed416 build/win32: fix static build
version.rc must only be included in client executable
2015-01-20 16:23:05 +01:00
Martin Fleisz
0be28ba0f6 Merge pull request #1965 from akallabeth/dynamic-addin-naming
Dynamic channel library naming
2014-10-31 13:42:16 +01:00
Martin Fleisz
d58c6de93c Merge pull request #2134 from akallabeth/windows_version_information
Windows version information
2014-10-31 12:23:11 +01:00
Marc-André Moreau
3d0f9e8e89 wfreerdp: consolidate cliprdr code 2014-10-23 13:11:20 -04:00
Armin Novak
89bb28adb2 Fixed setting of RV_VERSION_PATCH, now BUILD_NUMBER is used for every library.
Executable names are now correctly set, using CMAKE_EXECUTABLE_SUFFIX now.
Fixed version defines for winpr executables.
2014-10-09 16:18:35 +02:00
Armin Novak
5364a834c4 Added windows version information to build. 2014-10-03 15:17:40 +02:00
Marc-André Moreau
2a5192b027 Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Conflicts:
	client/Windows/wf_cliprdr.h
	client/Windows/wf_event.h
	client/X11/xf_client.c
	client/X11/xf_gdi.c
	libfreerdp/gdi/gdi.c
	server/Mac/mf_input.c
2014-09-17 19:09:56 -04:00
Armin Novak
059374457d Removed library prefix override. 2014-09-17 11:27:11 +02:00
Marc-André Moreau
342d37aea0 wfreerdp: add RDP8 graphics pipeline support 2014-09-12 16:30:57 -04:00
Bernhard Miklautz
0313ca3622 libfreerdp: always build "MONOLITHIC"
"libfreerdp" consisted of multiple (small) single libraries. If the cmake
option MONOLITHIC was used only one library was build combining all of
the libfreerdp-* libraries.
The only exceptions to this are libfreerdp-server and libfreerdp-client these
are build as separate libraries.

This commit obsoltes non-monolithic builds and makes monolithic builds
the default. The cmake option MONOLITHIC is also removed.
2014-09-12 00:19:53 +02:00
Armin Novak
ad3255354d Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without
SOVERSION information. (required by Android)
2014-07-11 11:53:58 +02:00
Bernhard Miklautz
6a49bcfe40 winpr: always build "monolitic"
winpr is now always build as single library.
The build option MONOLITHIC_BUILD doesn't influence this behavior anymore.

The only exception is winpr-makecert-tool which is still build as extra
library.

This obsoletes complex_libraries for winpr.
2014-07-10 11:10:58 +02:00
Zhang Zhaolong
bb2e5c5cb9 clipboard: wfreerdp: implement file clipping. 2014-03-10 14:25:59 +08:00
Zhang Zhaolong
169a0cd671 wfreerdp: floatbar: add files to CMakeLists. 2014-02-27 11:45:11 +08:00
Marc-André Moreau
17665378a9 wfreerdp: fix target exporting 2014-02-02 22:37:54 -05:00
Marc-André Moreau
37450da55d cmake: fix exporting of targets on pre-2.8.11 2013-10-29 14:47:40 -04:00
Marc-André Moreau
b480ce1830 freerdp: remove vendor-specific options from build system, add automatic ways of including external clients/servers 2013-09-03 20:37:04 -04:00
Benoît LeBlanc
03a401b8e6 CMakelists:
disabled installation of headers and libraries for the wayk client.
2013-07-25 21:59:21 -04:00
Marc-André Moreau
f0a45f96f5 client: add CLIENT_INTERFACE_SHARED option forcing shared client libs with BUILD_SHARED_LIBS=off, making a single library 2013-04-10 17:09:35 -04:00
Marc-André Moreau
022ceec22a xfreerdp: split client into executable and library 2013-04-02 16:22:30 -04:00
Marc-André Moreau
488d2c5672 wfreerdp: fix icon 2013-03-19 11:11:14 -04:00
Marc-André Moreau
acf9429b52 wfreerdp: split client into library and executable 2013-03-18 22:09:52 -04:00
Marc-André Moreau
aec86e1da8 wfreerdp: start splitting CLI from client core 2013-03-18 20:12:51 -04:00
Daryl Poe
b64408975d freerdp primitives library 2013-01-18 15:32:58 -07:00
Marc-André Moreau
f6748dba3f wfreerdp: update client 2012-11-22 09:06:45 -05:00
Marc-André Moreau
421c4c86c4 windows: fix NSIS packaging 2012-11-12 13:17:44 -05:00
Marc-André Moreau
63858bf722 cmake: improve NSIS packaging 2012-10-17 13:07:29 -04:00
Marc-André Moreau
aaef9694ab libfreerdp-channels: split in client/server functionality, move to libfreerdp-channels-client and libfreerdp-channels-server 2012-10-15 17:03:34 -04:00
Marc-André Moreau
7f98af7d20 libfreerdp-client: update clients to link to proper library 2012-10-14 12:21:33 -04:00
Marc-André Moreau
06fa85f31c cmake: refactoring of MONOLITHIC_BUILD 2012-10-13 17:30:59 -04:00
Marc-André Moreau
fba82c1a23 wfreerdp: fix compilation on Windows 2012-10-09 12:23:35 -04:00
Marc-André Moreau
e60a092d81 freerdp: fix headers 2012-10-08 23:02:04 -04:00
Marc-André Moreau
40eea7c76b cmake: rename WITH_MONOLITHIC_BUILD to MONOLITHIC_BUILD 2012-10-08 22:55:06 -04:00
Marc-André Moreau
ce71721698 channels: rename WITH_STATIC_PLUGINS to STATIC_CHANNELS 2012-10-08 22:53:05 -04:00
Marc-André Moreau
3d98273185 channels: fix export of symbols on Windows 2012-10-07 10:21:54 -04:00
Marc-André Moreau
2fde653d8a wfreerdp: merging with win32 integration branch 2012-10-02 11:05:21 -04:00
richterger
37ca446cae win32: make rdpdr printer plugin working on win32 2012-10-02 09:10:21 +02:00
richterger
fbe8a2eaae Make the rdpdr disk plugin working on windows.
Currently not working are rename and setting of read only attribute and file times.

In addition it also adds the ability to staticly link plugins into the binary, so you get one big exe and need no dlls. I have only tested this on windows (only disk plugin so far).

I use the following options for cmake for static binary:

cmake -DWITH_MONOLITHIC_BUILD=ON -DMSVC_RUNTIME=static -DBUILD_SHARED_LIBS=OFF -DWITH_RDPDR=ON -DOPENSSL_INCLUDE_DIR=\opensslpath\inc32 -DOPENSSL_LIBRARIES="\opensslpath\out32.dbg\ssleay32.lib;d:\path\out32.dbg\libeay32.lib" -G "Visual Studio 9 2008" .

Important notice: Openssl need to be compiled with the same static runtime. Currently missing is a switch to link different openssl libraries for debug and release builds.
2012-10-02 08:58:54 +02:00
Marc-André Moreau
659a901450 cmake: add solution folder subdirectories 2012-10-01 11:48:53 -04:00
Marc-André Moreau
f1fa98c997 wfreerdp: fix compilation warnings on Windows 2012-08-14 18:39:07 -04:00
Marc-André Moreau
bccc9cb8f5 cmake: update cmake client scripts for monolithic build 2012-08-14 00:11:04 -04:00
xangis
502396c99a Add stubs for wf_rail and wf_window for Windows client. 2012-07-24 17:58:04 -07:00
xangis
c74cae4209 Add building channels for Windows and stubs for clipboard reader. 2012-07-20 14:05:06 -07:00
Marc-André Moreau
82ea77158c wfreerdp: fix compilation on windows 2011-10-21 16:45:35 -04:00