Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PNG_LIBS = -lpng
LDFLAGS =
VENDORED_LIBS =
endif
CXXFLAGS = -std=c++11 -Os $(SDL_CFLAGS) -DMOD_VERSION=\"v$(MOD_VER)\"
CXXFLAGS = -std=c++14 -Os $(SDL_CFLAGS) -DMOD_VERSION=\"v$(MOD_VER)\"
LDLIBS = $(SDL_LIBS)
SOURCES = src/main.cpp src/back_stack.cpp src/command.cpp src/download_screen.cpp src/localization.cpp src/framework/badge.cpp src/framework/dialog.cpp src/framework/sdl_context.cpp src/framework/texture.cpp src/framework/controller.cpp src/framework/powerwatch.cpp src/framework/draw_helpers.cpp src/framework/utf8.cpp src/framework/font8x8_lookup.cpp src/framework/uitheme.cpp src/framework/list_jump.cpp
OBJECTS = $(SOURCES:.cpp=.o)
Expand Down
3 changes: 1 addition & 2 deletions src/framework/sdl_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

SDL_Context::SDL_Context(std::chrono::milliseconds fpsTime, bool powerButtonExit) : fpsTime(fpsTime), powerButtonExit(powerButtonExit)
{
powerwatch = new PowerWatch();
powerwatch = std::make_unique<PowerWatch>();
window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1280, 720, SDL_WINDOW_FULLSCREEN);
renderer = SDL_CreateRenderer(window, -1, 0);
if(renderer == NULL) {
Expand All @@ -35,7 +35,6 @@ SDL_Context::~SDL_Context()
SDL_DestroyRenderer(renderer);
SDL_DestroyWindow(window);
SDL_Quit();
delete powerwatch;
}

void SDL_Context::StartFrame()
Expand Down
2 changes: 1 addition & 1 deletion src/framework/sdl_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct SDL_Context
SDL_Window* window;
SDL_Renderer* renderer;
std::chrono::milliseconds fpsTime;
PowerWatch * powerwatch;
std::unique_ptr<PowerWatch> powerwatch;

private:
std::chrono::time_point<std::chrono::system_clock> nextFrameTime;
Expand Down
Loading