Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relative includes #88

Merged
merged 19 commits into from Feb 20, 2014
Merged

Relative includes #88

merged 19 commits into from Feb 20, 2014

Conversation

lioncash
Copy link
Member

Converts the header includes to use paths relative to Source/Core. Makes it more descriptive in identifying which module each include comes from.

lioncash and others added 5 commits February 18, 2014 02:19
Also fix the Windows build with this change.
Turns out Dolphin uses some macros that clash on OSX. However thankfully, this include is only used in Frame.cpp.
@delroth
Copy link
Member

delroth commented Feb 19, 2014

\o/

I'll do some scripting to try to find basic errors and fix them.

@BhaaLseN
Copy link
Member

Does not build on Win32; CommonFuncs.h misses clocale for some reason.
And, CommonFuncs.h includes Common.h which includes CommonFuncs.h - that should probably be fixed one way or another.

@BhaaLseN
Copy link
Member

DInput stuffs doesnt compile either, but I have no idea what it wants to tell me:
6>C:\Program Files (x86)\Windows Kits\8.1\Include\um\winnt.h(2500): error C2733: '_BitScanForward' : second C linkage of overloaded function not allowed (ControllerInterface\DInput\DInputJoystick.cpp) 6> D:\Microsoft Visual Studio 12.0\VC\include\intrin.h(108) : see declaration of '_BitScanForward' (and a lot more where that came from)

@delroth
Copy link
Member

delroth commented Feb 20, 2014

LGTM, 0 errors from my script.

delroth added a commit that referenced this pull request Feb 20, 2014
@delroth delroth merged commit 6d8df31 into dolphin-emu:master Feb 20, 2014
@lioncash lioncash deleted the relative-includes branch March 4, 2014 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants