mirror of https://github.com/odrling/Aegisub
Re-add platform-specific headers and fix prototypes.
Originally committed to SVN as r5141.
This commit is contained in:
parent
9d5a2b41b5
commit
c67fe6db5d
|
@ -29,11 +29,11 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "include/platform.h"
|
#include "include/platform.h"
|
||||||
//#include "platform_windows.h"
|
#include "platform_windows.h"
|
||||||
#include "platform_unix.h"
|
#include "platform_unix.h"
|
||||||
#include "platform_unix_bsd.h"
|
#include "platform_unix_bsd.h"
|
||||||
//#include "platform_unix_linux.h"
|
#include "platform_unix_linux.h"
|
||||||
//#include "platform_unix_osx.h"
|
#include "platform_unix_osx.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
|
|
|
@ -29,11 +29,11 @@ public:
|
||||||
// Hardware
|
// Hardware
|
||||||
virtual std::string CPUId();
|
virtual std::string CPUId();
|
||||||
virtual std::string CPUSpeed();
|
virtual std::string CPUSpeed();
|
||||||
virtual std::string CPUCores();
|
virtual int CPUCores();
|
||||||
virtual std::string CPUCount();
|
virtual int CPUCount();
|
||||||
virtual std::string CPUFeatures();
|
virtual std::string CPUFeatures();
|
||||||
virtual std::string CPUFeatures2();
|
virtual std::string CPUFeatures2();
|
||||||
virtual std::string Memory();
|
virtual uint64_t Memory();
|
||||||
|
|
||||||
// Unix Specific
|
// Unix Specific
|
||||||
virtual std::string UnixLibraries();
|
virtual std::string UnixLibraries();
|
||||||
|
|
|
@ -29,11 +29,11 @@ public:
|
||||||
// Hardware
|
// Hardware
|
||||||
virtual std::string CPUId();
|
virtual std::string CPUId();
|
||||||
virtual std::string CPUSpeed();
|
virtual std::string CPUSpeed();
|
||||||
virtual std::string CPUCores();
|
virtual int CPUCores();
|
||||||
virtual std::string CPUCount();
|
virtual int CPUCount();
|
||||||
virtual std::string CPUFeatures();
|
virtual std::string CPUFeatures();
|
||||||
virtual std::string CPUFeatures2();
|
virtual std::string CPUFeatures2();
|
||||||
virtual std::string Memory();
|
virtual uint64_t Memory();
|
||||||
|
|
||||||
virtual std::string PatchLevel();
|
virtual std::string PatchLevel();
|
||||||
virtual std::string QuickTimeExt();
|
virtual std::string QuickTimeExt();
|
||||||
|
|
|
@ -26,16 +26,16 @@ public:
|
||||||
PlatformWindows() {};
|
PlatformWindows() {};
|
||||||
virtual ~PlatformWindows() {};
|
virtual ~PlatformWindows() {};
|
||||||
const std::string OSVersion();
|
const std::string OSVersion();
|
||||||
std::string DesktopEnvironment();
|
const char* DesktopEnvironment();
|
||||||
|
|
||||||
// Hardware
|
// Hardware
|
||||||
virtual std::string CPUId();
|
virtual std::string CPUId();
|
||||||
virtual std::string CPUSpeed();
|
virtual std::string CPUSpeed();
|
||||||
virtual std::string CPUCores();
|
virtual int CPUCores();
|
||||||
virtual std::string CPUCount();
|
virtual int CPUCount();
|
||||||
virtual std::string CPUFeatures();
|
virtual std::string CPUFeatures();
|
||||||
virtual std::string CPUFeatures2();
|
virtual std::string CPUFeatures2();
|
||||||
virtual std::string Memory();
|
virtual uint64_t Memory();
|
||||||
|
|
||||||
// OpenGL
|
// OpenGL
|
||||||
virtual std::string OpenGLVendor();
|
virtual std::string OpenGLVendor();
|
||||||
|
|
Loading…
Reference in New Issue