funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-05-01 10:29:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed time display code so it does not require C++11.

Browse Source
This commit is contained in:
Pieter Hulshoff
2016-06-01 10:29:02 +02:00
parent 064932c46f
commit 382edc61f8
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RetroFE/Source/CMakeLists.txt
View File

@@ -214,5 +214,5 @@ if(MSVC)
set_target_properties(retrofe PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS") set_target_properties(retrofe PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
else() else()
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall") set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
endif() endif()

13
RetroFE/Source/Graphics/Component/ReloadableText.cpp
View File

@@ -22,9 +22,7 @@
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <iomanip> #include <time.h>
#include <ctime>
#include <chrono>
ReloadableText::ReloadableText(std::string type, Page &page, Configuration &config, Font *font, std::string layoutKey, float scaleX, float scaleY) ReloadableText::ReloadableText(std::string type, Page &page, Configuration &config, Font *font, std::string layoutKey, float scaleX, float scaleY)
: Component(page) : Component(page)
@@ -116,9 +114,12 @@ void ReloadableText::ReloadTexture()
std::string text; std::string text;
if (type_ == "time") if (type_ == "time")
{ {
std::chrono::system_clock::time_point now = std::chrono::system_clock::now(); time_t now = time(0);
std::time_t now_c = std::chrono::system_clock::to_time_t(now); struct tm tstruct;
ss << std::put_time(std::localtime(&now_c), "%r"); char buf[80];
tstruct = *localtime(&now);
strftime(buf, sizeof(buf), "%r", &tstruct);
ss << buf;
} }
if (type_ == "numberButtons") if (type_ == "numberButtons")
{ {