This adds the ability to simply close the emulator when launched externally and prevents changes designed for linux from generating conflicting controller configurations on Android (and may be needed for iOS as well).
Conflicts: core/hw/pvr/spg.cpp core/hw/sh4/interpr/sh4_interpreter.cpp reicast/android/src/com/reicast/emulator/MainActivity.java
TwistedUmbrella