From 03655a465f747c8e1ac4d33361fa9f1f6a79bb86 Mon Sep 17 00:00:00 2001
From: Zach Bacon <zachbacon@budgiemedia.rocks>
Date: Sat, 3 Sep 2016 17:07:30 -0400
Subject: [PATCH] Fix some compile issues and desktop launcher issues

---
 src/sdl/expr.ypp      | 3 +--
 src/wx/wxvbam.desktop | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/sdl/expr.ypp b/src/sdl/expr.ypp
index 843d09dd..6bde03b5 100644
--- a/src/sdl/expr.ypp
+++ b/src/sdl/expr.ypp
@@ -4,9 +4,8 @@ namespace std {
 #include <memory.h>
 #include <stdlib.h>
 #include <string.h>
+#include <cstdlib>
 }
-
-using namespace std;
  
 #include "../System.h"
 #include "../gba/elf.h"
diff --git a/src/wx/wxvbam.desktop b/src/wx/wxvbam.desktop
index 4a2036c7..31d3e7f2 100644
--- a/src/wx/wxvbam.desktop
+++ b/src/wx/wxvbam.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=VBA-M
 GenericName=Game Boy Advance Emulator
 Comment=Nintendo Game Boy Advance Emulator
-Exec=visualboyadvance-m-wx %f
+Exec=visualboyadvance-m %f
 Icon=vbam
 Categories=Game;Emulator;
 Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance;