Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Merged up and tested here #3

Merged
merged 18 commits into from

2 participants

John McCutchan Nigel Stewart
John McCutchan

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

Nigel Stewart
Collaborator

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

Nigel Stewart
Collaborator

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

Nigel Stewart nigels-com was assigned
Nigel Stewart nigels-com merged commit cc83144 into from
Nigel Stewart
Collaborator

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.

John McCutchan

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!

Nigel Stewart
Collaborator

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.

John McCutchan

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
Commits on Aug 9, 2012
  1. John McCutchan

    Build GLU

    johnmccutchan authored
  2. John McCutchan
  3. John McCutchan
  4. John McCutchan

    Build updates

    johnmccutchan authored
  5. John McCutchan
  6. John McCutchan
  7. John McCutchan
  8. John McCutchan
  9. John McCutchan
  10. John McCutchan
  11. John McCutchan

    Merge branch 'master' of https://github.com/p3/regal

    johnmccutchan authored
    Conflicts:
    	config/Makefile.nacl-64
Commits on Aug 14, 2012
  1. John McCutchan

    Makefile changes

    johnmccutchan authored
  2. John McCutchan
Commits on Aug 15, 2012
  1. John McCutchan
  2. John McCutchan
  3. John McCutchan
  4. John McCutchan
  5. John McCutchan
Something went wrong with that request. Please try again.