r885 - in branches/1.34-rc2: . code/client code/qcommon

[DONOTREPLY at icculus.org]

Author: tma
Date: 2006-09-02 14:17:32 -0400 (Sat, 02 Sep 2006)
New Revision: 885

Modified:
   branches/1.34-rc2/Makefile
   branches/1.34-rc2/code/client/snd_main.c
   branches/1.34-rc2/code/qcommon/q_shared.h
Log:
* Bumped version to 1.34-rc2 (not rc1 to avoid confusion, with previous
  versions)
* Disabled OpenAL by default
* Disable including SVN revsion in version number


Modified: branches/1.34-rc2/Makefile
===================================================================
--- branches/1.34-rc2/Makefile	2006-09-02 18:13:59 UTC (rev 884)
+++ branches/1.34-rc2/Makefile	2006-09-02 18:17:32 UTC (rev 885)
@@ -134,14 +134,7 @@
 VERSION=$(shell grep "\#define Q3_VERSION" $(CMDIR)/q_shared.h | \
   sed -e 's/.*".* \([^ ]*\)"/\1/')
 
-USE_SVN=
-ifeq ($(wildcard .svn),.svn)
-  SVN_REV=$(shell LANG=C svnversion .)
-  ifneq ($(SVN_REV),)
-    SVN_VERSION=$(VERSION)_SVN$(SVN_REV)
-    USE_SVN=1
-  endif
-endif
+USE_SVN=0
 ifneq ($(USE_SVN),1)
     SVN_VERSION=$(VERSION)
 endif

Modified: branches/1.34-rc2/code/client/snd_main.c
===================================================================
--- branches/1.34-rc2/code/client/snd_main.c	2006-09-02 18:13:59 UTC (rev 884)
+++ branches/1.34-rc2/code/client/snd_main.c	2006-09-02 18:17:32 UTC (rev 885)
@@ -386,7 +386,7 @@
 		Cmd_AddCommand( "s_stop", S_StopAllSounds );
 		Cmd_AddCommand( "s_info", S_SoundInfo );
 
-		cv = Cvar_Get( "s_useOpenAL", "1", CVAR_ARCHIVE );
+		cv = Cvar_Get( "s_useOpenAL", "0", CVAR_ARCHIVE );
 		if( cv->integer ) {
 			//OpenAL
 			started = S_AL_Init( &si );

Modified: branches/1.34-rc2/code/qcommon/q_shared.h
===================================================================
--- branches/1.34-rc2/code/qcommon/q_shared.h	2006-09-02 18:13:59 UTC (rev 884)
+++ branches/1.34-rc2/code/qcommon/q_shared.h	2006-09-02 18:17:32 UTC (rev 885)
@@ -26,7 +26,7 @@
 // q_shared.h -- included first by ALL program modules.
 // A user mod should never modify this file
 
-#define Q3_VERSION            "ioQ3 1.33"
+#define Q3_VERSION            "ioQ3 1.34-rc2"
 #ifndef SVN_VERSION
   #define SVN_VERSION Q3_VERSION
 #endif