Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 19:27:27 +0000 (21:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 19:27:27 +0000 (21:27 +0200)
37 files changed:
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/darkplaces-sdl [deleted symlink]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.6.dylib
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libjpeg.62.dylib [changed mode: 0644->0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.0.0.0.dylib [deleted file]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.1.dylib [new file with mode: 0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.dylib
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.6.0.dylib [deleted file]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng12.0.dylib [deleted file]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng14.14.dylib [new file with mode: 0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.3.4.dylib [deleted file]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.4.3.dylib [deleted file]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.0.6.dylib [deleted file]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.3.2.dylib [deleted file]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl [changed mode: 0755->0644]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libfreetype.6.dylib
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libjpeg.62.dylib [changed mode: 0644->0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.0.0.0.dylib [deleted file]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.1.dylib [new file with mode: 0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.dylib
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libogg.0.6.0.dylib [deleted file]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libogg.0.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng12.0.dylib [deleted file]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng14.14.dylib [new file with mode: 0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libtheora.0.3.4.dylib [deleted file]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libtheora.0.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbis.0.4.3.dylib [deleted file]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbis.0.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisenc.2.0.6.dylib [deleted file]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisenc.2.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisfile.3.3.2.dylib [deleted file]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisfile.3.dylib [changed from symlink to file mode: 0755]
misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl [changed mode: 0755->0644]

diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/darkplaces-sdl b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/darkplaces-sdl
deleted file mode 120000 (symlink)
index eacf4c3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../darkplaces/darkplaces-sdl
\ No newline at end of file
index 456544f045f1c8c002ab633a8801731f44747ffe..a017aafc3ed75f0e407063b7818cf0e29c915f38 100755 (executable)
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.6.dylib and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.6.dylib differ
old mode 100644 (file)
new mode 100755 (executable)
index 45a0c32..c9377fc
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libjpeg.62.dylib and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libjpeg.62.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.0.0.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.0.0.0.dylib
deleted file mode 100755 (executable)
index bd4c21e..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.0.0.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.1.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.1.dylib
new file mode 100755 (executable)
index 0000000..4987925
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.1.dylib differ
index 28fd8a43eddc69a340622911b815203d38fe7d80..284867935b4828fab185ddd27d7e1dc989d870b3 120000 (symlink)
@@ -1 +1 @@
-libmodplug.0.0.0.dylib
\ No newline at end of file
+libmodplug.1.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.6.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.6.0.dylib
deleted file mode 100755 (executable)
index 70c9d91..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.6.0.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index f19a424472ef8fb0abb37fb6bff37d783edbcb45..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libogg.0.6.0.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..29b7951a45051ed9048505e01e9f05f254377d56
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng12.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng12.0.dylib
deleted file mode 100644 (file)
index 37cf606..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng12.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng14.14.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng14.14.dylib
new file mode 100755 (executable)
index 0000000..db3c57f
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng14.14.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.3.4.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.3.4.dylib
deleted file mode 100755 (executable)
index 93b2c9f..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.3.4.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index 27ba0f4344732f6d470e59706c1772ed92e1fb96..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libtheora.0.3.4.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..9c3f4da1167cbe9971fb1a67c55b751583c3971b
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.4.3.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.4.3.dylib
deleted file mode 100755 (executable)
index 8ed3114..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.4.3.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index 51971ac91e038b5c31fc6f70206f146041a897c7..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libvorbis.0.4.3.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..f85ffbef69e1cb27dc653e001ccb66bfd3e40533
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.0.6.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.0.6.dylib
deleted file mode 100755 (executable)
index 1fbdb28..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.0.6.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index c03ef3979faaaaf63616851b2164419c2c9f4e90..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libvorbisenc.2.0.6.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8a345597a0ff34ca75e21dd84d841da8859e9998
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.3.2.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.3.2.dylib
deleted file mode 100755 (executable)
index 1ac87a0..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.3.2.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index 131b7bd145bba4a3442b0b127f89caf0d46aef79..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libvorbisfile.3.3.2.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..310d9821ec0577fb1e978a09cc7b488d81787e2a
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.dylib differ
old mode 100755 (executable)
new mode 100644 (file)
index 77cdbe5..1926bbd
@@ -4,3 +4,4 @@ export DYLD_LIBRARY_PATH="${0%/*}"
        # same dir as the executable
 
 exec "$0"-bin "$@" -notexturenonpoweroftwo +"gl_lockarrays 0"
+
index 456544f045f1c8c002ab633a8801731f44747ffe..a017aafc3ed75f0e407063b7818cf0e29c915f38 100755 (executable)
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libfreetype.6.dylib and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libfreetype.6.dylib differ
old mode 100644 (file)
new mode 100755 (executable)
index 45a0c32..c9377fc
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libjpeg.62.dylib and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libjpeg.62.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.0.0.0.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.0.0.0.dylib
deleted file mode 100755 (executable)
index bd4c21e..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.0.0.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.1.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.1.dylib
new file mode 100755 (executable)
index 0000000..4987925
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.1.dylib differ
index 28fd8a43eddc69a340622911b815203d38fe7d80..284867935b4828fab185ddd27d7e1dc989d870b3 120000 (symlink)
@@ -1 +1 @@
-libmodplug.0.0.0.dylib
\ No newline at end of file
+libmodplug.1.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libogg.0.6.0.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libogg.0.6.0.dylib
deleted file mode 100755 (executable)
index 70c9d91..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libogg.0.6.0.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index f19a424472ef8fb0abb37fb6bff37d783edbcb45..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libogg.0.6.0.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..29b7951a45051ed9048505e01e9f05f254377d56
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libogg.0.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng12.0.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng12.0.dylib
deleted file mode 100644 (file)
index 37cf606..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng12.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng14.14.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng14.14.dylib
new file mode 100755 (executable)
index 0000000..db3c57f
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libpng14.14.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libtheora.0.3.4.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libtheora.0.3.4.dylib
deleted file mode 100755 (executable)
index 93b2c9f..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libtheora.0.3.4.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index 27ba0f4344732f6d470e59706c1772ed92e1fb96..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libtheora.0.3.4.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..9c3f4da1167cbe9971fb1a67c55b751583c3971b
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libtheora.0.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbis.0.4.3.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbis.0.4.3.dylib
deleted file mode 100755 (executable)
index 8ed3114..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbis.0.4.3.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index 51971ac91e038b5c31fc6f70206f146041a897c7..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libvorbis.0.4.3.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..f85ffbef69e1cb27dc653e001ccb66bfd3e40533
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbis.0.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisenc.2.0.6.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisenc.2.0.6.dylib
deleted file mode 100755 (executable)
index 1fbdb28..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisenc.2.0.6.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index c03ef3979faaaaf63616851b2164419c2c9f4e90..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libvorbisenc.2.0.6.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8a345597a0ff34ca75e21dd84d841da8859e9998
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisenc.2.dylib differ
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisfile.3.3.2.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisfile.3.3.2.dylib
deleted file mode 100755 (executable)
index 1ac87a0..0000000
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisfile.3.3.2.dylib and /dev/null differ
deleted file mode 120000 (symlink)
index 131b7bd145bba4a3442b0b127f89caf0d46aef79..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-libvorbisfile.3.3.2.dylib
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..310d9821ec0577fb1e978a09cc7b488d81787e2a
Binary files /dev/null and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisfile.3.dylib differ