Commit Graph

2606 Commits

Author SHA1 Message Date
Patrick Decat fe15c4e928 Merge branch 'master' of https://github.com/pdecat/synergy 2014-10-29 18:43:05 +01:00
Patrick Decat 1f5c18720a Apply patch from https://github.com/synergy/synergy/issues/3749 2014-10-28 16:06:38 +01:00
Xinyu Hou e98b3678df Merge branch 'jerry-sandbox' 2014-10-28 10:52:47 +00:00
Nick Bolton 6dea28d2a0 Update README 2014-10-27 15:53:53 -07:00
Nick Bolton 8e05604338 Update README 2014-10-27 15:51:36 -07:00
Nick Bolton 5d33d7fa86 Added some simple "getting started" info to the wiki 2014-10-27 15:51:10 -07:00
Xinyu Hou 117208754f Hided elevate checkbox on Unix #4130 2014-10-27 17:15:50 +00:00
Xinyu Hou 23670c5f9b Moved elevate checkbox to settings #4130 2014-10-27 17:10:12 +00:00
Xinyu Hou d2191b6b93 Auto elevate for Windows UAC and screen lock #4130 2014-10-27 16:39:18 +00:00
Xinyu Hou 4d3fd14ada Merge branch 'caramis-master' 2014-10-27 14:46:54 +00:00
Xinyu Hou 6a5da5aaac Merge branch 'jerry-sandbox' 2014-10-27 14:40:39 +00:00
Xinyu Hou 6756296d85 Made daemon take full responsibility for logging #4128 2014-10-27 14:11:43 +00:00
Xinyu Hou 39b534f3b8 Merge branch 'petroules-mac-fixes' 2014-10-27 13:04:59 +00:00
Xinyu Hou 35e8c88887 Updated ignored list on Mac 2014-10-27 12:00:18 +00:00
Xinyu Hou de68346874 Fixed hm config error 2014-10-27 11:58:25 +00:00
Xinyu Hou 4f51d5fa50 Used Mac Sdk from config to detect Mac version 2014-10-24 17:22:07 +01:00
Xinyu Hou df29bf8e54 Merge branch 'helkanen-master' 2014-10-24 15:10:44 +01:00
Jake Petroules 5b4e46f8ea Fix Info.plist for Synergy GUI.
This fixes the blurriness on Retina displays.
2014-10-23 08:29:51 -07:00
Jake Petroules fed63422a6 Fix typo causing 64-bit binaries to be excluded on OS X 10.6+. 2014-10-23 08:19:00 -07:00
Xinyu Hou e707b426cf Ignore Qt Creator user's settings file 2014-10-23 13:22:51 +01:00
Xinyu Hou 5c6eba8790 Merged argsParse to master 2014-10-23 13:21:41 +01:00
Xinyu Hou 561d1c6993 Version to 1.6.1 2014-10-23 12:39:28 +01:00
Nick Bolton c364befde2 Merge branch 'petroules-64bit' 2014-10-23 12:36:32 +01:00
Xinyu Hou a32cb41342 Parse arg refactoring #4124
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
Xinyu Hou a71ebc78b3 Parse arg refactoring #4124
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
Xinyu Hou 943a355359 Parse arg refactoring #4124
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
Nick Bolton a7a0b0021d Only build 64-bit for OS X 10.6 and above #4126
@jakepetroules: Looks like we use ScreenSaver.framework which is not
available in 64-bit until OS X 10.6
(https://developer.apple.com/library/mac/documentation/UserExperience/Reference/ScreenSaver/ObjC_classic/index.html#//apple_ref/doc/uid/20001822).
I've changed the CMake configuration to only build 64-bit for OS X 10.6
and above. Hopefully everything should work now - try it out!
2014-10-23 10:00:11 +01:00
Jake Petroules 67f17a0fda Fix SDK detection to work with modern versions of Xcode.
This finds the the OS X SDK directory by using xcrun and known fallbacks; users shouldn't be symlinking /Developer.
2014-10-23 01:13:33 -07:00
Jake Petroules e3d57af4fd Add support for building with 64-bit architectures on OS X.
This patch brings full 64-bit compatibility to Synergy on OS X by
replacing all obsolete 32-bit only Carbon functions with modern
equivalents. All functions introduced have been available since 10.4 so
this won't affect the minimum deployment target. Specifically:

Creating an empty CGEvent and getting its location is behaviourally
identical to GetGlobalMouse, and yes, both are in flipped coordinates.
This was tested with a multi-monitor configuration as well.

TrackMouseLocationWithOptions is behaviourally identical to
GetGlobalMouse in these cases because the timeout was 0 and none of the
other out params were used, except for the MouseTrackingResult in one
call was checked against kMouseTrackingTimedOut. Since the timeout was 0
and not kEventDurationForever, that value never could have been returned
anyway.

Instead of attempting to define SIntXX and UIntXX manually, MacTypes.h
is included on OS X. These types were wrong in 64-bit mode because of
this, causing type redefinition errors.
2014-10-23 01:13:33 -07:00
Nick Bolton e786dbd60f fixed code style 2014-10-22 17:04:20 +01:00
Xinyu Hou e26ccfdce6 Parse arg refactoring #4124
Added unit testing
2014-10-22 16:52:08 +01:00
Xinyu Hou f9f2d8e8af Parse arg refactoring #4124
Implemented argParser class.
2014-10-22 16:35:28 +01:00
Xinyu Hou d2814a423c Parse arg refactoring #4124
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
Nick Bolton cfa10d68ca Merge branch 'master' of https://github.com/ali1234/synergy into ali1234-master 2014-10-22 15:52:06 +01:00
Nick Bolton c09d2ad91e changed @ to - in package name 2014-10-22 15:06:17 +01:00
Nick Bolton 7abcf13317 fixed "hm dist src" command to support branches
also allowed non-unix platforms to run src
2014-10-22 15:06:17 +01:00
Nick Bolton f3218ff53c added branch name to package names
now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
2014-10-22 15:06:17 +01:00
Nick Bolton 072e03c6ce changed @ to - in package name 2014-10-22 15:05:28 +01:00
Nick Bolton 420ac24b0b fixed "hm dist src" command to support branches
also allowed non-unix platforms to run src
2014-10-22 15:05:28 +01:00
Nick Bolton c18411b9a4 added branch name to package names
now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
2014-10-22 15:05:27 +01:00
Nick Bolton 74873d763e changed @ to - in package name 2014-10-22 15:05:08 +01:00
Nick Bolton aa8d6c95c7 fixed "hm dist src" command to support branches
also allowed non-unix platforms to run src
2014-10-22 15:05:08 +01:00
Nick Bolton e0101b884f added branch name to package names
now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
2014-10-22 15:05:07 +01:00
Nick Bolton 326901ef86 changed @ to - in package name 2014-10-22 14:58:13 +01:00
Nick Bolton 1c1f0e70f2 changed @ to - in package name 2014-10-22 14:56:57 +01:00
Nick Bolton 5a6bdfb5e6 fixed "hm dist src" command to support branches
also allowed non-unix platforms to run src
2014-10-22 14:37:15 +01:00
Nick Bolton fe95ec5bc8 added branch name to package names
now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
2014-10-22 14:37:15 +01:00
Nick Bolton 90aa90f19f created dist src export path 2014-10-22 14:37:15 +01:00
Nick Bolton b85432aeee changed svn export to git export 2014-10-22 14:37:15 +01:00
Nick Bolton 0f926658dc added getGitRevision function to get current git revision. 2014-10-22 14:37:15 +01:00