Okay, good news. I mostly figured it out 1) I manually merged the "Add APPLICATION_ADDITIONAL_CPPFLAGS" patch to my sdl-android
2) I remembered that I had to add a symlink to extraconfig.cfg and modify AndroidAppSettings.cfg to reference it 3) I solved some ohrrpgce-unrelated breakage of zipalign that happened when Unity decided it wanted to update my Android SDK for me. So now I am able to build working apk files using the latest source. I will still need your help getting my git tree properly rebased or whatever so I can merge more of your fixes (I still don't have the any of e-mail stuff, the other-targets stuff, or the more recent pelya stuff that you merged) Right now I am working on moving all the apk project folders out of my sdl-android working copy. I can symlink them in there instead. Then I will feel a little bit safer about messing around in there. --- James On Tue, Dec 6, 2016 at 8:52 AM, James Paige <[email protected]> wrote: > On Sat, Nov 26, 2016 at 2:21 PM, Ralph Versteegen <[email protected]> > wrote: > >> 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 >> > > I am going to need some help with this. > > I had indeed been keeping sdl_android and ohrrpgce separate. > > sdl_android had all the actual important changes on it. > > my ohrrpgce branch was kept the same as my sdl_android branch, with the > addition of: > * replacing the splash screen > * replacing the default button images > * removing the non-ohrrpgce related stuff in projects/jni/application > > I am very hesitant to do a git reset --hard because I don't even know how > to check and verify whether or not I have additional commits that would get > wiped, nor do I know how to un-do it if it goes awry. > > I also have a ton of un-committed project folders inside my working copy's > projects/jni/application/ which I *cannot* commit because doing so would > expose the game's keystore files to anybody on github. > > (Right now I am just trying to re-build an apk for A Hagen's Void Pyramid > 1.4) > > > > > > > > > > > >> 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 >> >> >
_______________________________________________ Ohrrpgce mailing list [email protected] http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
