Emulator

Name of clone: adlr-mplus

branch: http://code.google.com/r/adlr-mplus/source/list?name=macbuildfix

(top 2 changes)

Purpose of code changes on this branch:

Fix compilation on mac when using cmake. Build instructions:

• install cmake if you don't have it
• mkdir output && cd output && cmake .. && make -j2

When reviewing my code changes, please focus on:

No breaking Linux or Windows

After the review, please pull into branch:

master

Also, I know I have commit privs, but I am very much in the habit of doing reviews before commit. If this is just not dolphin policy, I can stop, but I'd rather err on the side of safety, since I'm new here.