Pull my ohrrpgce branch (and also pull my sdl_android branch to your sdl_android branch). Note, I just rewrote my branches since it appeared you hadn't pulled them yet (or at least hadn't pushed your branches back to github) and I realised I hadn't kept sdl_android and ohrrpgce separate; if that's a problem just do "git checkout ohrrpgce; git reset --hard tmc/ohrrpgce" etc *assuming* you've made no additional commits which would get wiped
Keeping sdl_android and ohrrpgce separate might well turn out to be a good thing for merging upstream changes back in. For now I've had to manually cherry-pick certain commits to support x86 and newer ndks. On 27 November 2016 at 10:14, James Paige <[email protected]> wrote: > What do I need to merge to my commandergenius ohrrpgce branch? Everything? > > > On Saturday, November 26, 2016, <[email protected]> wrote: > >> teeemcee >> 2016-11-26 02:55:38 -0800 (Sat, 26 Nov 2016) >> 109 >> scons: Pass CXXFLAGS to android build script. Requires latest version of >> my commandergenius "ohrrpgce" branch >> --- >> U wip/SConscript >> U wip/android/AndroidAppSettings.cfg >> _______________________________________________ >> Ohrrpgce mailing list >> [email protected] >> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org >> > > _______________________________________________ > Ohrrpgce mailing list > [email protected] > http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org > >
_______________________________________________ Ohrrpgce mailing list [email protected] http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
