diff --git a/autobuild.xml b/autobuild.xml index 6ef841d11effd3d1a7e3cfd6ad2da2465ffea692..500a814d9af1caef3f1f717d7d17c874c8fead5a 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1055,6 +1055,34 @@ <string>glew</string> <key>platforms</key> <map> + <key>linux64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>aabbfbb1bca96b922d5ad28346cf56bd</string> + <key>hash_algorithm</key> + <string>md5</string> + <key>url</key> + <string>http://depot.alchemyviewer.org/pub/linux64/lib/glew-1.12.0-linux64-201507120713.tar.bz2</string> + </map> + <key>name</key> + <string>linux64</string> + </map> + <key>windows</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>e0dd5a99f36f9d1885bdb6ebc672164a</string> + <key>hash_algorithm</key> + <string>md5</string> + <key>url</key> + <string>http://depot.alchemyviewer.org/pub/windows/lib/glew-1.12.0-windows-201507120657.tar.bz2</string> + </map> + <key>name</key> + <string>windows</string> + </map> <key>windows64</key> <map> <key>archive</key> diff --git a/indra/cmake/GLEW.cmake b/indra/cmake/GLEW.cmake index 7c53ff2eb92646802fa84bd8b456bc40f4af5f4e..3443f46bff0030c87ff1978f7fb8dee48ca3a634 100644 --- a/indra/cmake/GLEW.cmake +++ b/indra/cmake/GLEW.cmake @@ -1,15 +1,14 @@ # -*- cmake -*- include(Prebuilt) -if (NOT USESYSTEMLIBS) +if (NOT USESYSTEMLIBS AND NOT DARWIN) use_prebuilt_binary(glew) if (WINDOWS) set(GLEW_LIBRARIES debug glew32sd.lib optimized glew32s.lib) - elseif (DARWIN OR LINUX) - # TODO - #set(GLEW_LIBRARIES libglew.a) + elseif (LINUX) + set(GLEW_LIBRARIES libGLEW.a) endif (WINDOWS) set(GLEW_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include") -endif (NOT USESYSTEMLIBS) \ No newline at end of file +endif (NOT USESYSTEMLIBS AND NOT DARWIN) \ No newline at end of file