Permalink
Browse files

ui-console: Update to commit 48441f5.

mupen64plus/mupen64plus-ui-console@48441f5

*   48441f5 Merge pull request #17 from littleguy77/master
|\
| * 44f0f50 Fix windows build regression introduced in PR 12.
|/
*   8c56a77 Merge pull request #16 from mupen64plus/revert-14-master
|\
| * b2bbc85 Revert "Remove SDL build dependency."
|/
* 8edabd0 Merge pull request #14 from littleguy77/master
* 87ef789 Remove SDL build dependency.
  • Loading branch information...
littleguy77 committed Jan 18, 2015
1 parent 3051883 commit cbf2e508f2d128f6bb6c982dfe6264be9d7f7208
Showing with 6 additions and 1 deletion.
  1. +6 −1 jni/mupen64plus-ui-console/src/main.c
@@ -624,7 +624,12 @@ static m64p_error ParseCommandLineFinal(int argc, const char **argv)
#define CALLBACK_FUNC NULL
#endif
EXPORT
#ifndef WIN32
/* Allow external modules to call the main function as a library method. This is useful for user
* interfaces that simply layer on top of (rather than re-implement) UI-Console (e.g. mupen64plus-ae).
*/
__attribute__ ((visibility("default")))
#endif
int main(int argc, char *argv[])
{
int i;

0 comments on commit cbf2e50

Please sign in to comment.