Fix for icons on OSes other than Windows. Small fixes for travis

Didn't test. Also added memory monitoring to travis.
This commit is contained in:
Danila Malyutin 2015-07-11 03:15:07 +03:00
parent e338c3938b
commit 7795305c9f
3 changed files with 316 additions and 5 deletions

View file

@ -5,6 +5,10 @@
#include "rpcs3.h"
#include "MainFrame.h"
#ifndef __WINDOWS__
#include "frame_icon.xpm"
#endif
#include "git-version.h"
#include "Ini.h"
#include "Emu/SysCalls/Modules/cellSysutil.h"