summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2013-01-26 21:40:45 +0000
committerTim Angus <tim@ngus.net>2013-02-16 21:54:27 +0000
commit8087aac13d690c6400c4333f4b9cddb6cdf1cd22 (patch)
treee197caa517aea973a896b9333d258e90e0417574
parentbb36efc466eec1dee0c72895fe66036c6cfd51e6 (diff)
Fix some SMP bits I missed
-rw-r--r--Makefile3
-rwxr-xr-xmake-macosx-ub.sh6
-rwxr-xr-xmake-macosx.sh2
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
"