On 15/01/15 19:46, Carl Worth wrote:
On Thu, Jan 08 2015, Jose Fonseca wrote:
Note that Windows build is only supported with SCons.  Never with
autobuild.

OK. That's good for me to learn. I've requested that the folks doing our
automated build testing here will also start testing scons builds, so
hopefully on our end we can avoid breaking scons builds in the future.

In fact, SCons build was broken on that branch, with Windows or Linux.
I've pushed a few fixes to

    
https://urldefense.proofpoint.com/v2/url?u=http-3A__cgit.freedesktop.org_-7Ejrfonseca_mesa_log_-3Fh-3Dsha1&d=AwIFAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=zfmBZnnVGHeYde45pMKNnVyzeaZbdIqVLprmZCM2zzE&m=FfS216LW8_fToy0piPZxvYi76YnGav36XjwL67HX9nE&s=zzRHTEVMlVcoaHGOXGrLgQB4AJwxVRWtiIPjpwOYKgg&e=

Thanks. I've incorporated these fixes into my commits and rebased
everything onto the latest master. You can see what I have here:

        
https://urldefense.proofpoint.com/v2/url?u=http-3A__cgit.freedesktop.org_-7Ecworth_mesa_log_-3Fh-3Dsha1&d=AwIFAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=zfmBZnnVGHeYde45pMKNnVyzeaZbdIqVLprmZCM2zzE&m=FfS216LW8_fToy0piPZxvYi76YnGav36XjwL67HX9nE&s=051ojFb2n2ifCMWEr_XmkYQyBVDbiY99Azeq7i2KIjI&e=

The only change I didn't pull in was the "|| defined(_WIN32)" to force
compilation of the CryptoAPI SHA-1 support on a Windows build, (since
this file won't even be compiled).

This is enough to get things building without failing.  And in fact I

Looks like you didn't finish that sentence. Perhaps there was nothing
important there.

Oh, just saying that in fact I got it to build that module on Windows.


So my recommendation is: disable the shader cache on all scons builds,
get this merged and working on master with automake, then I'll add the
HAVE_SHA1 * checks on SCons and enable this as time permits.

That sounds like a good plan. I can push what I've got above unless
there are any objections from anybody.

Jose

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to