Merged up and tested here #3

Merged
merged 18 commits into from Aug 16, 2012

Projects

None yet

2 participants

@johnmccutchan
Contributor

I've merged the NaCL dispatcher changes and removed my now redundant RegalNaCL.cpp / .h. I've tested here building with shell script.

@nigels-com
Contributor

Glad to here we're converging. I'll take a look today.

@nigels-com
Contributor

I've merged the majority of this - the remaining conflicts I'll give some soak time.

@nigels-com nigels-com was assigned Aug 15, 2012
@nigels-com nigels-com merged commit cc83144 into p3:master Aug 16, 2012
@nigels-com
Contributor

I didn't completely finish my merge before I pushed to github. I'll do a second-go-around on the Regal.h and build configuration issues.

@johnmccutchan
Contributor

Cool. I have only tested a nacl-64 build under cygwin, I'm going to try and find time to test nacl-32 on my machine too. Thanks for cleaning up my stuff and getting it merged!

@nigels-com
Contributor

I'd like to unify the Makefile vs Makefile.nacl, but to do that in an informed way, I'll need to spend some time understanding the intended scheme for building NaCL apps.

@johnmccutchan
Contributor

A good place to understand where the build system I went with came from is naclports: http://code.google.com/p/naclports/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment