Commit Graph

112 Commits

Author SHA1 Message Date
Davide Beatrici
ba217fd660 macx/osax: don't build for deprecated i386 architecture
https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
2019-10-10 00:11:24 +02:00
Davide Beatrici
e9029a904e Remove "compat", i386 is not supported anymore
"compat" was a very small and simple program; its purpose was to show a message informing the user that the Mumble binary is only for x86_64 processors.

The i386 architecture is not supported in Xcode 10, meaning that we cannot compile it anymore.

https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
2019-10-10 00:11:16 +02:00
Davide Beatrici
9ab5fe97b6 Set target macOS version to 10.9
"libstdc++" was deprecated with Xcode 8 and is not supported in Xcode 10.

The new library is "libc++", available with macOS 10.9+.

https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
2019-10-09 23:35:41 +02:00
Jan Klass
19b5702168 Bump version to 1.4.0
1.3.0 has been released. master now represents the current state of
development towards the next feature release 1.4.0.

Bugfixes for 1.3 will happen in the 1.3.x branch.

Compared to earlier version bumps we bump a lot more files because of
we produce more artifacts; overlay process, dll and exe split, etc.

This should have happened right after the 1.3.x branch was split off.
2019-09-22 10:24:19 +02:00
Davide Beatrici
88931266b2 macx/scripts/osxdist.py: add "--no-compat-warning" option
QMake always passes "-arch x86_64" after the parameters specified in our project file, meaning that we can't build the application as 32 bit.

This option allows us to disable the feature (warning when trying to run Mumble on a 32 bit system) for the CI build.
2019-04-05 00:59:40 +02:00
Davide Beatrici
1813fe1af3 macx/scripts/osxdist.py: copy Opus library into App Bundle
The script copies the CELT (dynamic) libraries into the App Bundle, so that they are installed and then loaded by Mumble.

This commit adds the Opus library to the list of files to copy, necessary because it is loaded at runtime since e0ee016e5c.
2019-04-05 00:57:17 +02:00
Davide Beatrici
b427333257 Auto-update LICENSE.header in source files 2019-01-25 04:56:19 +01:00
davidebeatrici
42e8d60bcb macx: don't set custom build directory 2018-02-18 23:56:34 +01:00
davidebeatrici
e348e47f4a Remove leftover includes from "main" and "macx" project files 2018-01-12 18:08:15 +01:00
Mikkel Krautz
f6ba3a52bf Auto-update LICENSE.header in source files. 2018-01-01 23:05:37 +01:00
Mikkel Krautz
828d9301f5 Remove DIST directive from all .pro files.
We used to use DIST for referencing extra files that should be included
in our tarballs created by 'make dist'.

However, we've since migrated away relying on 'make dist' in release.pl.
Instead, we include everything, and have a list of items to exclude, such
as IETF RFC drafts distributed in 3rdparty/speex-src that do not adhere to
the Debian Free Software Guidelines.
2017-08-06 20:38:14 +02:00
Jan Klass
27a983d094 Fix indentation in pro files
Make them consistently two spaces indentation.

In two places a wrong indentation level was fixed.
2017-08-05 20:37:19 +02:00
Davide Beatrici
d04995899a Move .pri files and "toolchain" folder in "qmake" 2017-03-05 15:48:16 +01:00
Mikkel Krautz
91ebb8b0b5 Update tree copyrights to 2017. 2017-01-08 21:05:57 +01:00
Mikkel Krautz
f01f6e5528 macx/compat: fix build of compat.m shim with Sierra SDK.
The Sierra SDK seems to require an id<NSApplicationDelegate>
for its setDelegate: call.

To accomplish this, split off the existing adoption of
NSFileManagerDelegate into a seperate class extension.

Then, add another class extension for conforming to the
NSApplicationDelegate protocol.

Both of them are gated with MAC_OS_X_VERSION_MAX_ALLOWED
to allow building with older SDKs.
2016-11-25 23:17:33 +01:00
Mikkel Krautz
d54cb77be3 macx/osax: bump overlay version to force re-install on macOS. 2016-07-18 17:35:33 +02:00
Mikkel Krautz
4e2c7e384f macx: update to use LICENSE.header. 2016-05-10 22:42:03 +02:00
Mikkel Krautz
b0d53e1f86 compiler.pri: unsure that all our compiler.pri CFLAGS and CXXFLAGS are also applied for Objective-C(++).
...And fix all the errors that change introduces throughout the source tree.
2015-11-21 16:46:03 +01:00
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