This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 7a4f4c9c5ec4c7326a0c9074d7edf550e4c96cbf Author: David Capello <[email protected]> Date: Sun Nov 30 21:00:27 2014 -0300 Support running multiple instances on OS X (fix #533) --- src/allegro/src/macosx/main.m | 2 ++ src/allegro/src/macosx/system.m | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/allegro/src/macosx/main.m b/src/allegro/src/macosx/main.m index 2363da7..363a9a0 100644 --- a/src/allegro/src/macosx/main.m +++ b/src/allegro/src/macosx/main.m @@ -226,8 +226,10 @@ int allegro_main(int argc, char *argv[], NSObject* app_delegate) __crt0_argc = argc; __crt0_argv = argv; +#if 0 if (!osx_bootstrap_ok()) /* not safe to use NSApplication */ call_user_main(); +#endif [NSApplication sharedApplication]; diff --git a/src/allegro/src/macosx/system.m b/src/allegro/src/macosx/system.m index a5072b1..9acefaa 100644 --- a/src/allegro/src/macosx/system.m +++ b/src/allegro/src/macosx/system.m @@ -440,10 +440,12 @@ static int osx_sys_init(void) { long result; +#if 0 /* If we're in the 'dead bootstrap' environment, the Mac driver won't work. */ if (!osx_bootstrap_ok()) { return -1; } +#endif /* Install emergency-exit signal handlers */ old_sig_abrt = signal(SIGABRT, osx_signal_handler); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
