From 12bfcd05990a50be083b5926bf0cff5f4d502787 Mon Sep 17 00:00:00 2001 From: Sacha Date: Mon, 25 Nov 2013 14:17:37 +1000 Subject: [PATCH] Qt: Some platforms don't like letters in version number. --- Core/Config.cpp | 2 +- Qt/Settings.pri | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 9fb166adfe..27f66c8278 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -143,7 +143,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { graphics->Get("SoftwareSkinning", &bSoftwareSkinning, true); graphics->Get("TextureFiltering", &iTexFiltering, 1); // Auto on Windows, 2x on large screens, 1x elsewhere. -#ifdef _WIN32 +#if defined(_WIN32) && !defined(USING_QT_UI) graphics->Get("InternalResolution", &iInternalResolution, 0); #else graphics->Get("InternalResolution", &iInternalResolution, pixel_xres >= 1024 ? 2 : 1); diff --git a/Qt/Settings.pri b/Qt/Settings.pri index ff385ad1d3..9d503bbfbe 100644 --- a/Qt/Settings.pri +++ b/Qt/Settings.pri @@ -13,8 +13,8 @@ P = $$_PRO_FILE_PWD_/.. INCLUDEPATH += $$P/ext/zlib $$P/native/ext/glew $$P/Common exists($$P/.git): GIT_VERSION = $$system(git describe --always) -!isEmpty(GIT_VERSION): VERSION = $$GIT_VERSION -DEFINES += PPSSPP_GIT_VERSION=\\\"$$VERSION\\\" +isEmpty(GIT_VERSION): GIT_VERSION = $$VERSION +DEFINES += PPSSPP_GIT_VERSION=\\\"$$GIT_VERSION\\\" win32-msvc* { QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast