mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-25 05:21:02 +00:00
OS version detection without deprecated API
This commit is contained in:
parent
3e1bb9017b
commit
e9b24a10a1
2 changed files with 68 additions and 0 deletions
|
@ -153,6 +153,7 @@ typedef NSInteger NSApplicationActivationPolicy;
|
||||||
#include "v_video.h"
|
#include "v_video.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "i_rbopts.h"
|
#include "i_rbopts.h"
|
||||||
|
#include "i_osversion.h"
|
||||||
|
|
||||||
#undef Class
|
#undef Class
|
||||||
|
|
||||||
|
@ -2094,9 +2095,33 @@ void CreateMenu()
|
||||||
[NSApp setMainMenu:menuBar];
|
[NSApp setMainMenu:menuBar];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DarwinVersion GetDarwinVersion()
|
||||||
|
{
|
||||||
|
DarwinVersion result = {};
|
||||||
|
|
||||||
|
int mib[2] = { CTL_KERN, KERN_OSRELEASE };
|
||||||
|
size_t size = 0;
|
||||||
|
|
||||||
|
if (0 == sysctl(mib, 2, NULL, &size, NULL, 0))
|
||||||
|
{
|
||||||
|
char* version = static_cast<char*>(alloca(size));
|
||||||
|
|
||||||
|
if (0 == sysctl(mib, 2, version, &size, NULL, 0))
|
||||||
|
{
|
||||||
|
sscanf(version, "%hu.%hu.%hu",
|
||||||
|
&result.major, &result.minor, &result.bugfix);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
} // unnamed namespace
|
} // unnamed namespace
|
||||||
|
|
||||||
|
|
||||||
|
const DarwinVersion darwinVersion = GetDarwinVersion();
|
||||||
|
|
||||||
|
|
||||||
#ifdef main
|
#ifdef main
|
||||||
#undef main
|
#undef main
|
||||||
#endif // main
|
#endif // main
|
||||||
|
|
43
src/cocoa/i_osversion.h
Executable file
43
src/cocoa/i_osversion.h
Executable file
|
@ -0,0 +1,43 @@
|
||||||
|
/*
|
||||||
|
** i_osversion.h
|
||||||
|
**
|
||||||
|
**---------------------------------------------------------------------------
|
||||||
|
** Copyright 2012-2014 Alexey Lysiuk
|
||||||
|
** All rights reserved.
|
||||||
|
**
|
||||||
|
** Redistribution and use in source and binary forms, with or without
|
||||||
|
** modification, are permitted provided that the following conditions
|
||||||
|
** are met:
|
||||||
|
**
|
||||||
|
** 1. Redistributions of source code must retain the above copyright
|
||||||
|
** notice, this list of conditions and the following disclaimer.
|
||||||
|
** 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
** notice, this list of conditions and the following disclaimer in the
|
||||||
|
** documentation and/or other materials provided with the distribution.
|
||||||
|
** 3. The name of the author may not be used to endorse or promote products
|
||||||
|
** derived from this software without specific prior written permission.
|
||||||
|
**
|
||||||
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||||
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||||
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||||
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||||
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
**---------------------------------------------------------------------------
|
||||||
|
**
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
struct DarwinVersion
|
||||||
|
{
|
||||||
|
uint16_t major;
|
||||||
|
uint16_t minor;
|
||||||
|
uint16_t bugfix;
|
||||||
|
};
|
||||||
|
|
||||||
|
extern const DarwinVersion darwinVersion;
|
Loading…
Reference in a new issue