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

Remove hard dependencies of GLX and libGL from Dolphin. #1340

Merged
merged 2 commits into from Oct 22, 2014

Conversation

Sonicadvance1
Copy link
Contributor

We can't have a hard dependency on GLX on a system that is EGL only.
So having a hard dependency on a X11+EGL system is stupid.

Also fixes a library include that I missed that made us link against libGL, which doesn't work on a system that doesn't provide libGL.

This is particularly annoying on a EGL only system that doesn't have GLX.
I must have missed this when dropping OpenGL library includes. This is annoying when on a system that doesn't have libGL.
@Sonicadvance1
Copy link
Contributor Author

Not defining USE_EGL implies using GLX on Linux.

skidau added a commit that referenced this pull request Oct 22, 2014
Remove hard dependencies of GLX and libGL from Dolphin.
@skidau skidau merged commit 5d4b4c7 into dolphin-emu:master Oct 22, 2014
@gilcel
Copy link

gilcel commented Oct 22, 2014

Not sure if I should report it here or as an issue but this breaks OS X build:
[100%] Building CXX object Source/Core/DolphinWX/CMakeFiles/Dolphin.dir/WxUtils.cpp.o
Copying OS X content Binaries/Dolphin.app/Contents/Resources/Dolphin.icns
Linking CXX executable ../../../Binaries/Dolphin.app/Contents/MacOS/Dolphin
Undefined symbols for architecture x86_64:
"_CGLChoosePixelFormat", referenced from:
_grabViaOpenGL in libwx.a(glgrab.cpp.o)
"_CGLCreateContext", referenced from:
_grabViaOpenGL in libwx.a(glgrab.cpp.o)
"_CGLSetCurrentContext", referenced from:
_grabViaOpenGL in libwx.a(glgrab.cpp.o)
"_CGLSetFullScreen", referenced from:
_grabViaOpenGL in libwx.a(glgrab.cpp.o)
"_CGLDestroyPixelFormat", referenced from:
_grabViaOpenGL in libwx.a(glgrab.cpp.o)
"_CGLClearDrawable", referenced from:
_grabViaOpenGL in libwx.a(glgrab.cpp.o)
"_CGLDestroyContext", referenced from:
_grabViaOpenGL in libwx.a(glgrab.cpp.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[2]: *** [Binaries/Dolphin.app/Contents/MacOS/Dolphin] Error 1
make[1]: *** [Source/Core/DolphinWX/CMakeFiles/Dolphin.dir/all] Error 2
make: *** [all] Error 2

@Sonicadvance1
Copy link
Contributor Author

Fixed in PR #1362

@Sonicadvance1 Sonicadvance1 deleted the EGL-fixes branch October 22, 2014 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants