From 7e2edad8efea55e8df1faa695d1389ef4e326d7c Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 16 Jul 2013 13:28:28 +0200 Subject: switch the build system to waf This commit adds a new build system based on waf. configure and Makefile are deprecated effective immediately and someday in the future they will be removed (they are still available by running ./old-configure). You can find how the choice for waf came to be in `DOCS/waf-buildsystem.rst`. TL;DR: we couldn't get the same level of abstraction and customization with other build systems we tried (CMake and autotools). For guidance on how to build the software now, take a look at README.md and the cross compilation guide. CREDITS: This is a squash of ~250 commits. Some of them are not by me, so here is the deserved attribution: - @wm4 contributed some Windows fixes, renamed configure to old-configure and contributed to the bootstrap script. Also, GNU/Linux testing. - @lachs0r contributed some Windows fixes and the bootstrap script. - @Nikoli contributed a lot of testing and discovered many bugs. - @CrimsonVoid contributed changes to the bootstrap script. --- video/out/x11_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/out/x11_common.c') diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 09492a2294..54cd063505 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -50,7 +50,7 @@ #include #endif -#if HAVE_XDPMS +#if HAVE_XEXT #include #endif @@ -1552,7 +1552,7 @@ static void saver_on(struct vo_x11_state *x11) x11->screensaver_off = 0; if (xss_suspend(mDisplay, False)) return; -#if HAVE_XDPMS +#if HAVE_XEXT if (x11->dpms_disabled) { int nothing; if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) { @@ -1587,7 +1587,7 @@ static void saver_off(struct vo_x11_state *x11) x11->screensaver_off = 1; if (xss_suspend(mDisplay, True)) return; -#if HAVE_XDPMS +#if HAVE_XEXT if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) { BOOL onoff; CARD16 state; -- cgit v1.2.3