ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some compile issues and desktop launcher issues

This commit is contained in:
Zach Bacon 2016-09-03 17:07:30 -04:00
parent 1eb768578b
commit 03655a465f
No known key found for this signature in database
GPG Key ID: 7D110798AFE84B3A
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sdl/expr.ypp
View File

@ -4,9 +4,8 @@ namespace std {
#include <memory.h> #include <memory.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <cstdlib>
} }
using namespace std;
#include "../System.h" #include "../System.h"
#include "../gba/elf.h" #include "../gba/elf.h"

2
src/wx/wxvbam.desktop
View File

@ -4,7 +4,7 @@ Type=Application
Name=VBA-M Name=VBA-M
GenericName=Game Boy Advance Emulator GenericName=Game Boy Advance Emulator
Comment=Nintendo Game Boy Advance Emulator Comment=Nintendo Game Boy Advance Emulator
Exec=visualboyadvance-m-wx %f Exec=visualboyadvance-m %f
Icon=vbam Icon=vbam
Categories=Game;Emulator; Categories=Game;Emulator;
Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance; Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance;