r891 - in branches/1.34/code: client unix/setup
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Sep 5 03:29:26 EDT 2006
Author: ludwig
Date: 2006-09-05 03:29:13 -0400 (Tue, 05 Sep 2006)
New Revision: 891
Modified:
branches/1.34/code/client/snd_openal.c
branches/1.34/code/unix/setup/doit
branches/1.34/code/unix/setup/setup.xml
Log:
merge 888:890 from trunk
Modified: branches/1.34/code/client/snd_openal.c
===================================================================
--- branches/1.34/code/client/snd_openal.c 2006-09-05 07:05:04 UTC (rev 890)
+++ branches/1.34/code/client/snd_openal.c 2006-09-05 07:29:13 UTC (rev 891)
@@ -1792,8 +1792,8 @@
if((enumsupport = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT")))
{
char devicenames[1024] = "";
- const ALCchar *devicelist;
- const ALCchar *defaultdevice;
+ const char *devicelist;
+ const char *defaultdevice;
int curlen;
// get all available devices + the default device name.
Modified: branches/1.34/code/unix/setup/doit
===================================================================
--- branches/1.34/code/unix/setup/doit 2006-09-05 07:05:04 UTC (rev 890)
+++ branches/1.34/code/unix/setup/doit 2006-09-05 07:29:13 UTC (rev 891)
@@ -64,4 +64,4 @@
install -m 644 ../../../COPYING.txt image/COPYING
### makeself installer
-$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.$arch.run "icculus.org/quake3 $VERSION" ./setup.sh
+$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.$arch.run "ioquake3 $VERSION" ./setup.sh
Modified: branches/1.34/code/unix/setup/setup.xml
===================================================================
--- branches/1.34/code/unix/setup/setup.xml 2006-09-05 07:05:04 UTC (rev 890)
+++ branches/1.34/code/unix/setup/setup.xml 2006-09-05 07:29:13 UTC (rev 891)
@@ -1,6 +1,6 @@
<?xml version="1.0" standalone="yes"?>
<install product="ioquake3"
- desc="icculus.org/quake3"
+ desc="ioquake3"
version="@VERSION@"
update_url="http://www.icculus.org/quake3/updates.txt"
promptbinaries="yes">
@@ -17,7 +17,7 @@
Quake 3
<binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png" play="yes"
- name="icculus.org/quake3">
+ name="ioquake3">
ioquake3
</binary>
<files>
@@ -28,7 +28,7 @@
<option install="false" required="false">
Quake 3 Demo start script
<binary arch="any" libc="any" symlink="ioq3demo" icon="quake3.png" play="no"
- name="icculus.org/quake3 (Demo)">
+ name="ioquake3 (Demo)">
ioq3demo
</binary>
</option>
More information about the quake3-commits
mailing list