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