From 8087aac13d690c6400c4333f4b9cddb6cdf1cd22 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 26 Jan 2013 21:40:45 +0000 Subject: Fix some SMP bits I missed --- Makefile | 3 ++- make-macosx-ub.sh | 6 ------ make-macosx.sh | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 17e3740d..8354df18 100644 --- a/Makefile +++ b/Makefile @@ -1398,7 +1398,8 @@ Q3R2OBJ = \ $(B)/rend2/tr_vbo.o \ $(B)/rend2/tr_world.o \ \ - $(B)/renderer/sdl_gamma.o + $(B)/renderer/sdl_gamma.o \ + $(B)/renderer/sdl_glimp.o Q3R2STRINGOBJ = \ $(B)/rend2/glsl/bokeh_fp.o \ diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh index 515bb03e..987164d7 100755 --- a/make-macosx-ub.sh +++ b/make-macosx-ub.sh @@ -30,15 +30,9 @@ BASE_OBJ=" build/release-darwin-ppc/$BASEDIR/gameppc.dylib " RENDER_OBJ=" - build/release-darwin-x86_64/renderer_opengl1_smp_x86_64.dylib - build/release-darwin-x86/renderer_opengl1_smp_x86.dylib - build/release-darwin-ppc/renderer_opengl1_smp_ppc.dylib build/release-darwin-x86_64/renderer_opengl1_x86_64.dylib build/release-darwin-x86/renderer_opengl1_x86.dylib build/release-darwin-ppc/renderer_opengl1_ppc.dylib - build/release-darwin-x86_64/renderer_rend2_smp_x86_64.dylib - build/release-darwin-x86/renderer_rend2_smp_x86.dylib - build/release-darwin-ppc/renderer_rend2_smp_ppc.dylib build/release-darwin-x86_64/renderer_rend2_x86_64.dylib build/release-darwin-x86/renderer_rend2_x86.dylib build/release-darwin-ppc/renderer_rend2_ppc.dylib diff --git a/make-macosx.sh b/make-macosx.sh index f8995535..fbba6ca4 100755 --- a/make-macosx.sh +++ b/make-macosx.sh @@ -51,9 +51,7 @@ MPACK_OBJ=" build/release-darwin-${BUILDARCH}/$MPACKDIR/qagame${BUILDARCH}.dylib " RENDER_OBJ=" - build/release-darwin-${BUILDARCH}/renderer_opengl1_smp_${BUILDARCH}.dylib build/release-darwin-${BUILDARCH}/renderer_opengl1_${BUILDARCH}.dylib - build/release-darwin-${BUILDARCH}/renderer_rend2_smp_${BUILDARCH}.dylib build/release-darwin-${BUILDARCH}/renderer_rend2_${BUILDARCH}.dylib " -- cgit