<div dir="ltr"><div><div><div><div><div>Okay, good news. I mostly figured it out<br><br></div>1) I manually merged the "Add APPLICATION_ADDITIONAL_CPPFLAGS" patch to my sdl-android<br><br></div>2) I remembered that I had to add a symlink to extraconfig.cfg and modify AndroidAppSettings.cfg to reference it<br><br></div>3) I solved some ohrrpgce-unrelated breakage of zipalign that happened when Unity decided it wanted to update my Android SDK for me.<br><br></div>So now I am able to build working apk files using the latest source.<br><br></div>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)<br><div><div><div><div><div><div><div class="gmail_extra"><br></div><div class="gmail_extra">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.<br></div><div class="gmail_extra"><br>---<br></div><div class="gmail_extra">James<br><br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Dec 6, 2016 at 8:52 AM, James Paige <span dir="ltr"><<a href="mailto:Bob@hamsterrepublic.com" target="_blank">Bob@hamsterrepublic.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><span class="gmail-">On Sat, Nov 26, 2016 at 2:21 PM, Ralph Versteegen <span dir="ltr"><<a href="mailto:teeemcee@gmail.com" target="_blank">teeemcee@gmail.com</a>></span> wrote:<br></span><div class="gmail_extra"><div class="gmail_quote"><span class="gmail-"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">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<br></div></blockquote><div><br></div></span><div>I am going to need some help with this.<br><br></div><div>I had indeed been keeping sdl_android and ohrrpgce separate.<br><br></div><div>sdl_android had all the actual important changes on it.<br><br></div><div>my ohrrpgce branch was kept the same as my sdl_android branch, with the addition of:<br></div><div>* replacing the splash screen<br></div><div>* replacing the default button images<br></div><div>* removing the non-ohrrpgce related stuff in projects/jni/application<br><br></div><div>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.<br><br></div><div>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.<br><br></div><div>(Right now I am just trying to re-build an apk for A Hagen's Void Pyramid 1.4)<br><br><br><br><br></div><span class="gmail-"><div><br></div><div><br><br><br></div><div><br> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">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.<br></div><div class="gmail-m_1140188754563105711HOEnZb"><div class="gmail-m_1140188754563105711h5"><div class="gmail_extra"><br><div class="gmail_quote">On 27 November 2016 at 10:14, James Paige <span dir="ltr"><<a href="mailto:Bob@hamsterrepublic.com" target="_blank">Bob@hamsterrepublic.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">What do I need to merge to my commandergenius ohrrpgce branch? Everything?<div class="gmail-m_1140188754563105711m_7869406952147714642HOEnZb"><div class="gmail-m_1140188754563105711m_7869406952147714642h5"><br><br>On Saturday, November 26, 2016, <<a href="mailto:subversion@hamsterrepublic.com" target="_blank">subversion@hamsterrepublic.co<wbr>m</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">teeemcee<br>
2016-11-26 02:55:38 -0800 (Sat, 26 Nov 2016)<br>
109<br>
scons: Pass CXXFLAGS to android build script. Requires latest version of my commandergenius "ohrrpgce" branch<br>
---<br>
U wip/SConscript<br>
U wip/android/AndroidAppSetting<wbr>s.cfg<br>
______________________________<wbr>_________________<br>
Ohrrpgce mailing list<br>
<a>ohrrpgce@lists.motherhamster.o<wbr>rg</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" target="_blank">http://lists.motherhamster.org<wbr>/listinfo.cgi/ohrrpgce-motherh<wbr>amster.org</a><br>
</blockquote>
</div></div><br>______________________________<wbr>_________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.o<wbr>rg</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org<wbr>/listinfo.cgi/ohrrpgce-motherh<wbr>amster.org</a><br>
<br></blockquote></div><br></div>
</div></div><br>______________________________<wbr>_________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.o<wbr>rg</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org<wbr>/listinfo.cgi/ohrrpgce-motherh<wbr>amster.org</a><br>
<br></blockquote></span></div><br></div></div>
</blockquote></div><br></div></div></div></div></div></div></div></div>