Merge pull request #1140 from danilaml/linux-icon-fix

Fix for icons on OSes other than Windows. Small fixes for travis
This commit is contained in:
Hykem 2015-07-11 12:27:32 +01:00
commit 916967a7d7
3 changed files with 313 additions and 2 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"