Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3681 from Kokusho/master

Browse source 
some fix for qt interface
This commit is contained in:
Henrik Rydgård 2013-09-08 00:36:33 -07:00
commit 21b3b4bfee
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Qt/PPSSPP.pro
View file

@ -27,7 +27,7 @@ win32 {
LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32
}
linux {
LIBS += -L. -lCore -lCommon -lNative -ldl -lz
LIBS += -L. -lCore -lCommon -lNative -ldl
PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
!mobile_platform {
CONFIG += link_pkgconfig
@ -38,6 +38,8 @@ linux {
FFMPEG_DIR=../ffmpeg/linux/x86_64/lib/
LIBS += $${FFMPEG_DIR}libavformat.a $${FFMPEG_DIR}libavcodec.a $${FFMPEG_DIR}libavutil.a $${FFMPEG_DIR}libswresample.a $${FFMPEG_DIR}libswscale.a
}
# put this at the end avoids problems with some compilers
LIBS += -lz
}
# Main

12
Qt/QtHost.cpp
View file

@ -359,9 +359,15 @@ void NativeInitGraphics()
theme.checkOn = I_CHECKEDBOX;
theme.checkOff = I_SQUARE;
ui_theme.uiFont = UBUNTU24;
ui_theme.uiFontSmall = UBUNTU24;
ui_theme.uiFontSmaller = UBUNTU24;
#ifdef _WIN32
ui_theme.uiFont = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 22);
ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 15);
ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, g_Config.sFont.c_str(), 12);
#else
ui_theme.uiFont = UI::FontStyle(UBUNTU24, "", 20);
ui_theme.uiFontSmall = UI::FontStyle(UBUNTU24, "", 14);
ui_theme.uiFontSmaller = UI::FontStyle(UBUNTU24, "", 11);
#endif
ui_theme.checkOn = I_CHECKEDBOX;
ui_theme.checkOff = I_SQUARE;
ui_theme.whiteImage = I_SOLIDWHITE;