Commit Graph

393 Commits

Author SHA1 Message Date
Benoît LeBlanc
9785275769 Fix warnings 2013-12-05 12:12:55 -05:00
Marc-André Moreau
83ad1730b8 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	libfreerdp/core/input.c
	libfreerdp/core/update.c
2013-11-23 16:39:29 -05:00
Marc-André Moreau
76c842285d channels/rdpsnd: initial attempt at adding GSM610 support 2013-11-22 12:11:39 -05:00
Bernhard Miklautz
7457dd3de4 android build: Fixed program path detection 2013-11-18 19:58:01 +01:00
Bernhard Miklautz
391615bcfb android build: generate gprof file only if WITH_GPROF 2013-11-18 12:50:32 +01:00
Marc-André Moreau
fa64ca758d Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-11-15 10:50:30 -05:00
Bernhard Miklautz
916f2d2dbf winpr: fixed build warnings
* moved pthread_tryjoin_np to toplevel CMakeLists.txt
* removed duplicated -DHAVE_PTHREAD_GNU_EXT
2013-11-15 16:04:04 +01:00
Marc-André Moreau
b0b8b6aa9e Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-11-12 12:59:41 -05:00
Armin Novak
0d2fe6997e Fixed output path for JNI header generation script. 2013-11-12 10:21:14 +01:00
Marc-André Moreau
0e662a060e freerdp: improve pkgconfig .pc file generation 2013-11-09 17:51:09 -05:00
Armin Novak
9aa70d4589 Explicitly setting debug format now, as the shipped gdbserver is
not compatible with the default options for all toolchains.
2013-11-08 16:32:50 +01:00
Armin Novak
b40123fdff Using new library destination path for android. 2013-11-08 12:48:04 +01:00
Marc-André Moreau
0e1fd4a777 freerdp: merge with master 2013-11-06 13:53:10 -05:00
Bernhard Miklautz
a0161a12ac moved version information to freerdp/version.h
fixed #1465
2013-11-06 17:29:33 +01:00
Marc-André Moreau
3b0bcc9824 cmake: export to different directory, export more build info 2013-10-29 15:16:44 -04: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
c0a1c259f3 freerdp: start exporting targets automatically 2013-10-28 22:09:31 -04:00
Marc-André Moreau
9674c13c3b cmake: don't enable all warnings with clang 2013-10-25 09:48:02 -04:00
Bernhard Miklautz
6d2142182d ios simulator build: set CMAKE_OSX_SYSROOT
When building for iphone simulator it is required to set the CMAKE_OSX_SYSROOT
to "iphonesimulator" otherwise command line builds (with cmake --build) will fail.
2013-10-05 21:47:03 +02:00
Bernhard Miklautz
d7a9add3b4 Merge pull request #1514 from akallabeth/android_sound
Android sound support
2013-10-01 02:20:44 -07:00
Bernhard Miklautz
2cb6f5407a Merge pull request #1491 from akallabeth/android_profiler
Android profiler
2013-10-01 00:53:35 -07:00
Armin Novak
2269cbe155 Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_sound 2013-09-27 11:46:48 +02:00
Bernhard Miklautz
47b18ec841 osx build: don't set deployment target
If a deployment target is set within CMakeLists.txt detection might fail
if CMAKE_OSX_SYSROOT isn't set.
In case no deployment target is specified the latest available SDK is used as
deployment target and sysroot is set accordingly.

An other deployment target can still be set with -DCMAKE_OSX_DEPLOYMENT_TARGET=10.x
when running cmake for the first time or can be overwritten in cmake cache
later on.
2013-09-24 01:43:12 +02:00
Bernhard Miklautz
b647b5bfc9 some CMakeLists format fixes 2013-09-24 01:41:18 +02:00
Bernhard Miklautz
b4ac2ef8c8 osx build: make 10.7 default deployment target
10.6 isn't shipped with xcode > 4.4 anymore per default
If older/newer deployment target is required it can be set with
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.x
2013-09-23 23:29:55 +02:00
Armin Novak
e03305f18c Added debugging settings to allow android debugging. 2013-09-23 17:48:02 +02:00
Armin Novak
9f705055bb Android specific build options added. 2013-09-23 12:39:41 +02:00
Marc-André Moreau
929d292f35 wfreerdp: fix compilation 2013-09-19 12:08:20 -04:00
Armin Novak
9846c4496e Renamed android profiler flag to WITH_GPROF 2013-09-18 13:12:52 +02:00
Armin Novak
f62b7d74d3 Added profile option for android to build system. 2013-09-18 12:50:10 +02:00
Marc-André Moreau
518995a05e freerdp: merge with master 2013-09-16 17:10:27 -04:00
Marc-André Moreau
a26db7a980 Merge branch 'xrdp-ng' of github.com:awakecoding/FreeRDP 2013-09-16 16:46:33 -04:00
Benoît LeBlanc
a2f6c2003d Fixing compilation script for support on 10.7, 10.6
NOTE: Wayk-client still does not work on 10.6 because of a missing library used by Qt5.

Dyld Error Message:
  Library not loaded: /usr/lib/libc++.1.dylib
  Referenced from: /Applications/wayk-client.app/Contents/MacOS/../Frameworks/QtCore.framework/Versions/5/QtCore
  Reason: image not found
2013-09-11 10:36:38 -04:00
Marc-André Moreau
7574e7bfc9 Merge branch 'master' of github.com:awakecoding/FreeRDP into xrdp-ng 2013-09-10 17:02:36 -04:00
Marc-André Moreau
78423cb7e8 cmake: fix vendor-specific including 2013-09-10 14:46:48 -04:00
Marc-André Moreau
4a4a36d5c4 cmake: remove vendor-specific options 2013-09-10 14:03:15 -04:00
Marc-André Moreau
8191f4b7b6 cmake: remove debug output 2013-09-10 11:58:43 -04:00
Benoît LeBlanc
525a86280f Caching CMAKE_OSX_DEPLOYMENT_TARGET variable to prevent error on subsequent compilations 2013-09-10 11:45:25 -04:00
Benoît LeBlanc
f0e4b7ea21 Merge branch 'master' of git://github.com/awakecoding/FreeRDP
# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  cmake: remove debug output
  cmake: add vendor-specific packaging extension point
  cmake: fix package generation on Mac OS X
2013-09-10 09:31:49 -04:00
Marc-André Moreau
914d72d449 cmake: remove debug output 2013-09-10 09:27:14 -04:00
Marc-André Moreau
ef88801839 cmake: add vendor-specific packaging extension point 2013-09-09 22:25:47 -04:00
Marc-André Moreau
660e904a53 cmake: fix package generation on Mac OS X 2013-09-09 21:42:25 -04:00
Benoît LeBlanc
f1ae70fc74 Moved setting CMAKE_OSX_DEPLOYMENT_TARGET at beginning of script file, otherwise the compilation process fails. 2013-09-09 14:12:01 -04:00
Marc-André Moreau
f790831e7d Merge branch 'master' of github.com:awakecoding/FreeRDP into xrdp-ng 2013-09-05 15:23:19 -04:00
Armin Novak
d80214c7fd Added clang specific compiler warning suppression. 2013-09-05 12:14:33 +02:00
Marc-André Moreau
7edfe66274 freerdp: various missing link dependencies and symbol exports 2013-09-03 21:48:26 -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
Marc-André Moreau
8423fccbc2 libwinpr-pipe: add support for overlapped i/o with named pipes (synchronous, compatible implementation) 2013-08-22 22:36:37 -04:00
Marc-André Moreau
87593b4f19 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-08-15 13:16:05 -04:00
Armin Novak
c39d99b02d winpr config.h now generated in binary tree. 2013-08-12 13:51:18 +02:00
Armin Novak
2f45f68521 Generating config.h now in binray tree. 2013-08-12 12:53:04 +02:00
Marc-André Moreau
bb30ceb006 mfreerdp: cleanup 2013-08-09 21:23:08 -04:00
Marc-André Moreau
b164453d75 mfreerdp: fix 32-bit and universal build 2013-08-08 16:10:23 -04:00
Marc-André Moreau
190ed85a3d libwinpr-synch: add detection of timerfd support 2013-08-03 19:50:17 -04:00
Marc-André Moreau
ecc543d87d Merge branch 'master' of github.com:FreeRDP/FreeRDP into multitouch 2013-08-03 16:22:09 -04:00
Armin Novak
4d13b27a02 Added proper find_feature check for JPEG library. 2013-08-02 10:04:58 +02:00
Marc-André Moreau
1307026a94 freerdp: fix build warnings with MSVC 2013-07-26 15:21:19 -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
Benoît LeBlanc
6bbcfc0683 Added PDB debug information for windows builds 2013-07-24 15:36:15 -04:00
Marc-André Moreau
863b51f938 freerdp: merge with master 2013-06-28 12:50:24 -04:00
Bernhard Miklautz
b91f0bbb90 Merge pull request #1295 from bmiklautz/mac_build_fix
Mac build fix
2013-06-27 11:39:25 -07:00
Bernhard Miklautz
edc34d4d02 directfb: print "unmaintained" build warning
directfb client is currently unmaintained
2013-06-18 12:29:30 +02:00
Bernhard Miklautz
bcef931755 build: changed X11_FEATURE_TYPE to optional on osX
If X11_FEATURE_TYPE is disables on mac xfreerdp can't be build properly.
Setting it to optional allows to enable X11 builds with -DWITH_X11
2013-06-17 11:14:25 +02:00
Benoît LeBlanc
115b3978c6 Updating common API 2013-06-13 16:18:19 -04:00
Benoît LeBlanc
42f7c7f6b2 Static buid for Mac OS X, mf_interface, WITH_VERBOSE option
mf_interface is still in progress
2013-06-11 14:56:43 -04:00
Marc-André Moreau
69706b507e cmake: fix 32-bit clang with SSE 2013-05-31 13:51:50 -04:00
Marc-André Moreau
12a46784dd mfreerdp: integrate benoit's refactored mac client 2013-05-31 12:48:40 -04:00
Marc-André Moreau
fc75276128 cmake: add FindNPP.cmake 2013-05-28 01:14:20 -04:00
Marc-André Moreau
12e5b5fe8d cmake: bump minimum mac os x version to 10.5 (fixes 32-bit build) 2013-05-27 16:00:24 -04:00
Marc-André Moreau
d1e4798372 cmake: fix default server interface option 2013-04-29 19:53:56 -04:00
Marc-André Moreau
983f42254d xfreerdp-server: split into library/executable 2013-04-29 16:37:11 -04:00
Marc-André Moreau
4a48266743 cmake: fix 64-bit build with cmake 2.8.8 2013-04-22 16:33:23 -04:00
Marc-André Moreau
e7436a1a9d wfreerdp: minor 64-bit fixes 2013-04-10 21:15:38 -04:00
Marc-André Moreau
0cbdd6b641 freerdp: merge with master 2013-04-09 10:18:03 -04:00
Marc-André Moreau
dcc7c16ae1 cmake: fix nmake build 2013-04-08 23:08:16 -04:00
Marc-André Moreau
28547bece7 Merge pull request #1162 from mfleisz/cmthirdparty
cmake: Allow project-wide includes for third-party components
2013-04-04 14:23:13 -07:00
Martin Fleisz
0d30f6bf9e cmake: Allow project-wide includes for third-party components 2013-04-04 12:28:52 +02:00
Bernhard Miklautz
a4fc5f5c15 Set gstreamer to OPTIONAL on OS X 2013-04-03 01:12:22 +02:00
Martin Fleisz
38446b5f2b iOS: got rid of xcode project file 2013-03-29 14:28:27 +01:00
Marc-André Moreau
690b5147db cmake: simplify android build 2013-03-23 18:13:10 -04:00
Marc-André Moreau
37bb2bda8e cmake: build client/server interfaces by default 2013-03-18 22:29:52 -04:00
Martin Fleisz
e3a4d40b61 Android: Fixed JNI regenerate script 2013-03-13 06:02:37 -07:00
Bernhard Miklautz
1be90abcb9 Changed version to 1.1.0-beta1 2013-03-12 20:59:04 +01:00
Marc-André Moreau
cd7edbbc81 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-03-04 16:07:29 -05:00
Bernhard Miklautz
f3e1beca58 IPP: disable on arm and apple 2013-03-01 09:02:14 +01:00
Marc-André Moreau
4fd085baaf cmake: remove unused code 2013-02-28 14:54:08 -05:00
Bernhard Miklautz
295d799afe Merge remote-tracking branch 'upstream/master' into androidlib 2013-02-18 15:12:23 +01:00
Bernhard Miklautz
84b2966e67 android: adapted build for library project
- use manifestmerger.enabled to merge library manifest
- updated intent/activities to be implicit
2013-02-18 15:00:55 +01:00
Bernhard Miklautz
e5cf8ff7fb iOS: initial release of iFreeRDP
This is the initial release of iFreeRDP the FreeRDP iOS client.
Build instructions can be found in docs/README.ios.
2013-02-14 14:59:12 +01:00
Marc-André Moreau
a00ac1f689 Merge pull request #949 from hardening/eventfd
Add support for eventfd
2013-02-02 13:30:33 -08:00
C-o-r-E
a39ef9980f Merge remote-tracking branch 'upstream/master' 2013-01-30 19:05:35 -05:00
C-o-r-E
c7c9f2f1a6 mfreerdp-server: fixed mstsc bug. 2013-01-30 18:54:08 -05:00
Bernhard Miklautz
f239e1f9c4 aFreeRDP: initial release
This is the initial release of aFreeRDP the FreeRDP Android client.
For build instructions have a look to docs/README.android.
2013-01-29 12:59:58 +01:00
Bernhard Miklautz
2dee5a1517 build: changed detection for i686/x86_64
Fixes compilation/feature detection on arm.
2013-01-25 14:27:47 +01:00
hardening
f0d5e24979 Added preliminary support for eventfd 2013-01-23 21:59:01 +01:00
Daryl Poe
b64408975d freerdp primitives library 2013-01-18 15:32:58 -07:00
Corey C
17cd760e0d wfreerdp-server: merge upstream 2013-01-14 14:22:07 -05:00
Martin Fleisz
6bf903afcf cmake: corrected formatting 2012-12-20 04:13:36 -08:00
Martin Fleisz
30cb77835b cmake: fixed errors with Android build 2012-12-20 04:09:33 -08:00
LawrenceK
b02765c4c7 Add -march=i686 for 32 bit builds as otherwise defaults to i386 which does not supply one of the intrinsics. 2012-12-18 14:11:04 +00:00
Marc-André Moreau
84f358d3ce Merge pull request #812 from bmiklautz/versioning
build: fixed library versioning
2012-11-25 12:29:29 -08:00
Bernhard Miklautz
7d6f012097 cmake: fixed compatibility with version 2.8.0
* enable_cmake_compat to enable compatibility for specific cmake versions
* added required files for 2.8.2 and 2.8.6 (taken from a recent cmake version)
2012-11-23 14:12:52 +00:00
Bernhard Miklautz
9a33dbe826 build: fixed library versioning
Split version numbers into:
FREERDP_API_VERSION - the version of the API which is major.minor
FREERDP_VERSION - version of a release consisting of major.minor.revision (e.g. 1.1.0)
FREERDP_VERSION_FULL - like FREERDP_VERSION but with an optional "build" suffix (e.g 1.1.0-dev)
2012-11-18 17:07:33 +01:00
Marc-André Moreau
925eb59bf1 libfreerdp-common: refactoring of addin loader 2012-11-17 22:03:04 -05:00
Marc-André Moreau
598cfb3e9d Merge github.com:FreeRDP/FreeRDP 2012-11-17 16:46:53 -05:00
Corey C
ca89be3c91 wfreerdp-server: small packaging patch 2012-11-16 22:54:31 -05:00
Bernhard Miklautz
c04ea11900 Add support for version suffix
This adds the possibility to add a suffix like -rcx or -dev like
described in https://github.com/FreeRDP/FreeRDP/wiki/Release-Guide
2012-11-14 12:32:33 +01:00
Marc-André Moreau
421c4c86c4 windows: fix NSIS packaging 2012-11-12 13:17:44 -05:00
Marc-André Moreau
7714a625c3 macosx: fix linker option warning 2012-11-11 20:05:23 -05:00
Marc-André Moreau
1c4a587ef1 windows: fix build 2012-11-11 17:23:57 -05:00
Marc-André Moreau
0f79d5c62a cmake: added generation of static tables for channel subsystems 2012-11-05 19:55:15 -05:00
Marc-André Moreau
b3f6dea390 libfreerdp-client: started addin enumerator 2012-11-03 23:04:04 -04:00
Marc-André Moreau
e62860ab29 cmake: replace FindOptionalPackage macros with FindFeature macros 2012-11-02 19:27:01 -04:00
Marc-André Moreau
02c0a8fcaf libfreerdp-core: fix build on Windows, lower warning level 2012-10-30 17:20:21 -04:00
Marc-André Moreau
187147d399 libfreerdp-core: cleanup of TSG definitions 2012-10-29 15:02:35 -04:00
Marc-André Moreau
4d171408e9 freerdp: merging with master 2012-10-29 09:50:44 -04:00
Marc-André Moreau
b7a289f843 libwinpr: fix test build on Mac OS X 2012-10-25 15:34:57 -04:00
Bernhard Miklautz
279ae62c5a cunit: deprecate cunit
cunit is not used anymore. Testing is now done with ctest.
2012-10-25 13:43:33 +02:00
Bernhard Miklautz
d6569d945b cmake: make sure build works with cmake < 2.8.3
cmake/compat_2.8.3 contains files required for cmake versions < 2.8.3
and CheckCmakeCompat includes them if necessary.

CMakeParseArguments.cmake and FindPackageHandleStandardArgs.cmake are
taken from the modules shipped with cmake.
2012-10-25 11:22:53 +02:00
Marc-André Moreau
158030c57a libfreerdp-codec: add support for android cpu-features module 2012-10-22 19:01:19 -04:00
Marc-André Moreau
210ba6ac8c channels: fix linking of libfreerdp-client and libfreerdp-server 2012-10-19 13:10:42 -04:00
Marc-André Moreau
d251538252 libwinpr: fix build on linux 2012-10-18 22:05:06 -04:00
Marc-André Moreau
2f1711c506 libwinpr-path: make tests pass on Windows 2012-10-18 21:11:12 -04:00
Marc-André Moreau
dd23dd1aee ctest: change default output test path 2012-10-18 15:37:00 -04:00
Marc-André Moreau
e97f76a031 cmake: fix deb cpack generator 2012-10-17 18:14:35 -04:00
Marc-André Moreau
63858bf722 cmake: improve NSIS packaging 2012-10-17 13:07:29 -04:00
Marc-André Moreau
59f6d29335 cmake: get initial windows cpack generators to work 2012-10-17 10:46:40 -04:00
Marc-André Moreau
81e485736f channels: refactoring of channels cmake scripts with macros 2012-10-17 02:14:19 -04:00
Marc-André Moreau
c82ad752b9 cmake: improve default CPack configuration 2012-10-16 21:57:43 -04:00
Marc-André Moreau
65e51b9bbf cmake: fix RPATH configuration 2012-10-15 17:13:54 -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
b0f368b10e cmake: fix install path, add RPATH configuration 2012-10-14 12:58:09 -04:00
Marc-André Moreau
e764c81ad5 freerdp: fix building of libraries for Android 2012-10-13 20:31:01 -04:00
Marc-André Moreau
639bb0d79d cmake: started simplifying monolithic build option 2012-10-13 15:20:39 -04:00
Marc-André Moreau
2ee9f23a8e cmake: revert back to standard CTest BUILD_TESTING option 2012-10-13 09:50:02 -04:00
Marc-André Moreau
e2d3b4454c cmake: add automatic detection of architecture to enable SSE2 by default 2012-10-12 17:55:12 -04:00
Marc-André Moreau
7b2369a12e freerdp/include: remove public config.h file 2012-10-12 16:37:45 -04:00
Marc-André Moreau
c26a623ed1 cmake: rename BUILD_TESTING to TEST_BUILD 2012-10-12 16:04:46 -04:00
Marc-André Moreau
94ffaf704d Merge branch 'master' of github.com:FreeRDP/FreeRDP into channels 2012-10-11 09:28:49 -04:00
Marc-André Moreau
cebea5590a cmake: fix for fPIC in CMake 2.8.8- 2012-10-11 08:30:04 -04:00
Marc-André Moreau
1931c0d241 cmake: make channels static by default 2012-10-10 17:13:42 -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
e828feccb7 cmake: organize solution folders 2012-10-04 09:42:23 -04:00
Marc-André Moreau
59016f1c6f cmake: disable test build by default 2012-10-02 11:56:10 -04:00
Marc-André Moreau
2fde653d8a wfreerdp: merging with win32 integration branch 2012-10-02 11:05:21 -04: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
fcc9f91302 cmake: add support for solution groups 2012-09-30 22:58:59 -04:00