diff --git a/include/eepp/system/sys.hpp b/include/eepp/system/sys.hpp index 90a6ef80d..0ad8f512d 100644 --- a/include/eepp/system/sys.hpp +++ b/include/eepp/system/sys.hpp @@ -32,8 +32,10 @@ class EE_API Sys { /** @return The System Time */ static double GetSystemTime(); - /** @return The OS Name */ - static std::string GetOSName(); + /** @return The OS Name + * @param showReleaseName Instead of returning only the OS Name, it will append the release name or number. For Windows instead of "Windows" it will be "Windows 7", for "Linux" it will be "Linux 3.15" and so on. + */ + static std::string GetOSName( bool showReleaseName = false ); /** @return The OS Architecture */ static std::string GetOSArchitecture(); diff --git a/include/eepp/version.hpp b/include/eepp/version.hpp index e931a9a43..b52719ad5 100644 --- a/include/eepp/version.hpp +++ b/include/eepp/version.hpp @@ -4,10 +4,10 @@ #include #include -#define EEPP_MAJOR_VERSION 0 -#define EEPP_MINOR_VERSION 9 -#define EEPP_PATCHLEVEL 5 -#define EEPP_CODENAME "Makyo" +#define EEPP_MAJOR_VERSION 1 +#define EEPP_MINOR_VERSION 0 +#define EEPP_PATCHLEVEL 0 +#define EEPP_CODENAME "Bodhisattva" /** The compiled version of the library */ #define EEPP_VERSION(x) \ diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index f8e418e95..d532d827d 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,7 +1,11 @@ - + + + EnvironmentId + {b6114084-39c2-4cd0-b9e2-d8803dc6b446} + ProjectExplorer.Project.ActiveTarget 0 @@ -29,9 +33,12 @@ false 4 false + 80 + true true 2 true + false 0 false 0 @@ -54,7 +61,7 @@ Desktop Desktop {388e5431-b31b-42b3-b9ad-9002d279d75d} - 0 + 10 0 0 @@ -1628,11 +1635,11 @@ 1 - ProjectExplorer.Project.Updater.EnvironmentId - {b6114084-39c2-4cd0-b9e2-d8803dc6b446} + ProjectExplorer.Project.Updater.FileVersion + 16 - ProjectExplorer.Project.Updater.FileVersion - 15 + Version + 16 diff --git a/src/eepp/system/sys.cpp b/src/eepp/system/sys.cpp index 8ec778fb7..602edabce 100644 --- a/src/eepp/system/sys.cpp +++ b/src/eepp/system/sys.cpp @@ -236,17 +236,17 @@ static struct timeval start; #endif -std::string Sys::GetOSName() { +std::string Sys::GetOSName( bool showReleaseName ) { #if defined( EE_PLATFORM_POSIX ) struct utsname os; if ( -1 != uname( &os ) ) { - return std::string( os.sysname ) + " " + std::string( os.release ); + return std::string( os.sysname ) + ( showReleaseName ? " " + std::string( os.release ) : "" ); } return "Unknown"; #elif EE_PLATFORM == EE_PLATFORM_WIN - return GetWindowsVersion(); + return showReleaseName ? GetWindowsVersion() : "Windows"; #else return "Unknown"; #endif diff --git a/src/eepp/window/platform/x11/x11impl.cpp b/src/eepp/window/platform/x11/x11impl.cpp index 0ae42ba13..c5fc1463b 100644 --- a/src/eepp/window/platform/x11/x11impl.cpp +++ b/src/eepp/window/platform/x11/x11impl.cpp @@ -2,6 +2,7 @@ #if defined( EE_X11_PLATFORM ) +#define GLEW_NO_GLU #include #include #include diff --git a/src/eepp/window/window.cpp b/src/eepp/window/window.cpp index 1a164ae14..135dd78b7 100644 --- a/src/eepp/window/window.cpp +++ b/src/eepp/window/window.cpp @@ -379,7 +379,7 @@ void Window::SendVideoResizeCb() { void Window::LogSuccessfulInit(const std::string& BackendName , const std::string&ProcessPath ) { std::string msg( "Engine Initialized Succesfully.\n\tVersion: " + Version::GetVersionName() + " (codename: \"" + Version::GetCodename() + "\")" + "\n\tBuild time: " + Version::GetBuildTime() + - "\n\tOS: " + Sys::GetOSName() + + "\n\tOS: " + Sys::GetOSName(true) + "\n\tArch: " + Sys::GetOSArchitecture() + "\n\tCPU Cores: " + String::ToStr( Sys::GetCPUCount() ) + "\n\tProcess Path: " + ( !ProcessPath.empty() ? ProcessPath : Sys::GetProcessPath() ) +