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

Fix build problem on Snow Leopard #28

Merged
merged 1 commit into from May 3, 2013
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Fix build problem on Snow Leopard

  • Loading branch information
pcwalton committed May 2, 2013
commit 03a995e039945c74755f841e7a4d70c7962eb8ae
@@ -7,6 +7,12 @@ AR ?= ar
RUSTC ?= rustc
RUSTFLAGS ?=

ifeq ($(shell uname -s),Darwin)
ifeq ($(shell sw_vers | grep -c 10.6),1)
RUSTFLAGS += --cfg mac_10_6
endif
endif

RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')

.PHONY: all
4 gl2.rs
@@ -401,6 +401,7 @@ pub fn bind_texture(target: GLenum, texture: GLuint) {
}
}

#[cfg(not(target_os="macos", mac_10_6))]
pub fn bind_vertex_array(array: GLuint) {
unsafe {
ll::glBindVertexArray(array);
@@ -652,6 +653,7 @@ pub fn gen_textures(n: GLsizei) -> ~[GLuint] {
}
}

#[cfg(not(target_os="macos", mac_10_6))]
pub fn gen_vertex_arrays(n: GLsizei) -> ~[GLuint] {
unsafe {
let result = from_elem(n as uint, 0 as GLuint);
@@ -983,6 +985,7 @@ pub fn glBindRenderbuffer(++target: GLenum, ++renderbuffer: GLuint);

pub fn glBindTexture(++target: GLenum, ++texture: GLuint);

#[cfg(not(target_os="macos", mac_10_6))]
pub fn glBindVertexArray(++array: GLuint);

pub fn glBlendColor(++red: GLclampf, ++green: GLclampf, ++blue: GLclampf, ++alpha: GLclampf);
@@ -1081,6 +1084,7 @@ pub fn glGenRenderbuffers(++n: GLsizei, ++renderbuffers: *GLuint);

pub fn glGenTextures(++n: GLsizei, ++textures: *GLuint);

#[cfg(not(target_os="macos", mac_10_6))]
pub fn glGenVertexArrays(++n: GLsizei, arrays: *GLuint);

pub fn glGetActiveAttrib(++program: GLuint, ++index: GLuint, ++bufsize: GLsizei, ++length: *GLsizei, ++size: *GLint, ++_type: *GLenum, ++name: *GLchar);
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.