From 34d9c53716011b7ed113bc95f1e5266dd5a34751 Mon Sep 17 00:00:00 2001 From: Joel de Vahl Date: Thu, 23 Oct 2008 17:10:41 +0000 Subject: OSX build fix --- default.bam | 6 ------ src/engine/client/ec_gfx.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/default.bam b/default.bam index 1efa1288..8c8f3fe8 100644 --- a/default.bam +++ b/default.bam @@ -275,12 +275,6 @@ function build(settings) client_settings.linker.frameworks:add("AGL") client_settings.linker.frameworks:add("Carbon") client_settings.linker.frameworks:add("Cocoa") - - if config.coreaudio.value == 1 then - client_settings.linker.frameworks:add("CoreAudio") - client_settings.linker.frameworks:add("AudioToolbox") - client_settings.linker.frameworks:add("AudioUnit") - end else client_settings.linker.libs:add("X11") client_settings.linker.libs:add("GL") diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c index 8ed6a737..ba0d6052 100644 --- a/src/engine/client/ec_gfx.c +++ b/src/engine/client/ec_gfx.c @@ -439,7 +439,7 @@ float gfx_screenaspect() void gfx_clear_mask(int fill) { int i; - glGetIntegerv(GL_DEPTH_WRITEMASK, &i); + glGetIntegerv(GL_DEPTH_WRITEMASK, (GLint*)&i); glDepthMask(GL_TRUE); glClearDepth(0.0f); glClear(GL_DEPTH_BUFFER_BIT); -- cgit 1.4.1