mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,227 Commits 30 Branches 53 Tags 339 MiB
c3236b3055
Commit Graph

94 Commits

Author SHA1 Message Date
Mikkel Krautz
f8b63cd53c macx/osax: bump OS X overlay version to 19. 
This forces users to reinstall the overlay after
our recent bugfix round.
 2015-02-08 16:56:06 +01:00
Mikkel Krautz
f0ff84f6c0 Unify overlay code for Unix and OS X. 
This commit removes macx/overlay and merges
the OS X overlay into the Unix overlay in
overlay_gl.

Most of the overlay logic is exactly the same,
with most of the differences being in the
initialization code and the addition of few new
messages for the interactive client-in-overlay
feature that the OS X overlay suports.

The initialization code is factored out into
init_unix.c for Unix-likes and init_mac.c
for OS X.

These init files are #included by overlay.c.
That is, they're not separate translation
units. Doing it this way cuts down on the
total LOC count and overall complexity of the
code.

The interactive overlay support is ported
directly from the OS X overlay. It's mostly
a matter of supporting a few new message types:
OVERLAY_MSGTYPE_PID and OVERLAY_MSGTYPE_INTERACTIVE.

The overlay_gl.pro file in this commit is mostly
just a combination of the .pro files of the two
overlays, with a minor difference in the CFLAGS
for the OS X overlay. In old OS X overlay, the
overlay had an ".m" file extension, signalling
that it is an Objective-C source file to the
C compiler. Since the combined overlay has a
".c" extension, "-x objective-c" is added to
CFLAGS on OS X to tell the compiler to compile
the overlay as Objective-C code.
 2015-02-07 23:24:47 +01:00
Mikkel Krautz
1fab580baa Use glDrawArrays instead of immediate mode in OS X's drawOverlay(). 2015-02-05 23:11:28 +01:00
Mikkel Krautz
f4568b9e46 Port 6e9a7e7c to the OS X overlay. 2015-02-05 23:11:28 +01:00
Mikkel Krautz
8e3168b2e7 Port ec7e78d1 to the OS X overlay. 2015-02-05 23:11:28 +01:00
Mikkel Krautz
403aedb35d Add mach_override as a 3rdparty dep and hook it into the OS X overlay. 
Prior versions of mach_override were small (a single file),
and we just had its source live in the OS X overlay directory.

Newer versions of mach_override use libudis86, so the file count
goes up a fair bit. So much so that it doesn't make sense to
have it live inside the OS X overlay anymore.

Because of that, this commit moves it into 3rdparty.
 2015-02-05 23:11:28 +01:00
Mikkel Krautz
19996c5351 g15helper, macx/compat: fix OS X i386 targetting when using Qt 5. 2014-08-01 00:01:45 +02:00
Mikkel Krautz
840a31de0e macx/scripts: fix osxdist.py and build-installer-overlay to work in a source tree path with spaces in it. 2014-07-20 19:45:23 +02:00
Mikkel Krautz
689f4c1847 Bump version to 1.3.0 2014-04-05 10:26:25 +02:00
Mikkel Krautz
8632246f98 Bump version to 1.2.5 2013-06-08 23:41:51 +02:00
Kissaki
1e4bb6dbd0 Prepend Projectname to header guard defines 
* some few (4?) files actually already had it
 2013-06-04 21:59:52 +02:00
Kissaki
7642e722ff Adjust header guard defines for uniformity 
* Append underline to header guard defines to match the others (except ui_)
* Add guard to header files GlobalShortcut
* Adjust mklic.pl script to add guard to licenses.h,
and add updated licenses.h.
 2013-06-04 21:59:51 +02:00
Kissaki
40ca9b4507 Rename header guard defines to not use c++-reserved names 
* as pointed out in issue #842
adjust names to match other header files
 2013-06-04 21:59:50 +02:00
Mikkel Krautz
c8b6d697f5 osxdist.py: create a tarball in addition to the XIP archive for OS X static Murmur. 2013-01-20 18:47:37 +01:00
Mikkel Krautz
e430a08a55 macx: don't add scripts as a subdir, include it instead. 2012-10-29 20:03:21 +01:00
Mikkel Krautz
7de07df29d macx: pro file fixes for release.pl. 2012-10-29 19:42:38 +01:00
Mikkel Krautz
8fd27f62fc osxdist.py: use new README for static server; tweak filename. 2012-09-20 23:05:56 +02:00
Mikkel Krautz
98cacbc28f osxdist.py: only rmtree if path exists. 2012-09-16 21:38:23 +02:00
Mikkel Krautz
b86c3b7743 osxdist.py: move to a separate Murmur package on OS X. 2012-09-16 20:57:19 +02:00
Mikkel Krautz
63c91fa0dc osxdist.py: consistent .dmg naming for releases and snapshots. 2012-09-15 14:40:36 +02:00
Mikkel Krautz
971f0ff212 macx/osax: fix unused parameter warnings. 2012-08-18 13:38:50 +02:00
Mikkel Krautz
c2655fc265 Mumble: allow client to use SBCELT for CELT decoding via CONFIG(sbcelt). 2012-08-09 23:53:09 +02:00
Mikkel Krautz
05c740b730 macx/osax: bump OS X overlay version. 2012-08-05 20:34:26 +02:00
Mikkel Krautz
96fd34d36e macx/overlay: sync with latest mach_override. 2012-08-05 20:09:01 +02:00
Mikkel Krautz
4d41a6e01f build: put Objective-C(++) source files into OBJECTIVE_SOURCES to make qmake shut up. 2012-08-05 18:29:36 +02:00
Mikkel Krautz
c6c63fc949 Mumble: add Apple anchor library requirement to OS X codesign requirements. 2012-07-22 02:36:08 +02:00
Mikkel Krautz
08af6c2698 Mumble: properly specify designated requirements for OS X Developer ID code signing. 2012-07-22 01:35:47 +02:00
Mikkel Krautz
cf0d1d1199 Mumble: don't explicitly set codesign signature size in osxdist.py anymore (not needed for Developer ID). 2012-07-21 21:10:31 +02:00
Mikkel Krautz
f2253cfac9 Mumble: optimize osxdist.py for Developer ID signing. 2012-07-21 18:17:27 +02:00
Mikkel Krautz
723dd79f95 Mumble: simplify osxdist.py script, now that our OS X builds are static. 2012-07-21 18:02:52 +02:00
Mikkel Krautz
805e22d2cd Mumble: more force-shared library builds. 2012-07-21 18:00:15 +02:00
Mikkel Krautz
105c72eef7 OS X: update build for Xcode 4.4. 2012-07-11 13:21:24 +02:00
Mikkel Krautz
370c2d304d OS X: move upgrade variables to upgrade.xml for new productbuild overlay installer. 2012-02-22 18:25:32 +01:00
Mikkel Krautz
30b94b79f9 OS X: productbuild-based overlay installer. 2012-02-22 17:40:13 +01:00
Mikkel Krautz
4ad6ccf7c0 OS X: Add more licenses to disk image. 2012-02-18 17:59:18 +01:00
Mikkel Krautz
6c7d8dc9d5 OS X: Update dist scripts, add --no-server option. 2012-02-18 03:56:14 +01:00
Mikkel Krautz
9446e3e98d OS X: Build fixes for Xcode 4.3 (mostly PCH-related) 2012-02-18 03:23:28 +01:00
Mikkel Krautz
133a83f983 Build fixes for universal OS X. 2012-01-11 19:02:45 +01:00
Mikkel Krautz
81dee1c960 Update version number of OSAX overlay injector. 2011-06-25 21:30:20 +02:00
Mikkel Krautz
d9417cbccc Fix the overlay on Mac OS X 10.6.8. 2011-06-25 19:32:36 +02:00
Mikkel Krautz
e9cfd217dd Add build configuration for compiling on Lion. 2011-06-17 16:25:01 +02:00
Mikkel Krautz
23d1baaa27 osxdist: Add extra codesigning step for flat pkg files and the ability to select the keychain for your codesigning identity. 2011-03-27 15:22:10 +02:00
Mikkel Krautz
d12bb8a8de Bump OS X overlay installer version and set minimum required version to 1.2.3 since we haven't broken compatibility yet. 2011-03-27 15:22:10 +02:00
Mikkel Krautz
9923549a5d Overlay_macx: Undo intermediate CA workaround for versions of Mac OS X prior to Snow Leopard. 2011-03-26 20:33:17 +01:00
Thorvald Natvig
f3437a6ba7 Update copyright year ranges of dev team. 2011-03-18 05:52:51 +01:00
Thorvald Natvig
064a5a3672 Bump version to 1.2.4 2011-02-20 05:12:02 +01:00
Thorvald Natvig
1161c9a1c4 Remove 1.1.x - no longer maintained 2011-02-20 04:21:34 +01:00
Thorvald Natvig
685809cf83 Remove CELT 0.10.0 2011-02-07 02:00:47 +01:00
Mikkel Krautz
775165f33d Add CELT 0.11.0 to OS X dist script. 2011-02-04 19:21:58 +01:00
Thorvald Natvig
c61522e2e9 Remove older CELT 0.9.0 2011-01-23 02:31:06 +01:00