Cleaning house

reaction/ChangeLog

@@ -480,7 +480,7 @@
 2002-7-31 Timothee Besset <ttimo@idsoftware.com>
 	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=513
 		https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=506
-		porting fix from RTCW codebase. client re-orders it's pk3s to scan in the same order than the server
+		porting fix from RTCW codebase. client re-orders its pk3s to scan in the same order than the server
 		this eliminates several 'Invalid .PK3 file referenced' situations (caused by client not referencing the same thing as server)
 	+ fixed border remnants in ta ui
 	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=517
@@ -505,7 +505,7 @@
 	+ fix broken link in Linux FAQ	
 
 2002-7-27 Timothee Besset <ttimo@idsoftware.com>
-	+ ta ui: PB display in the browser, in it's additional tab, with sorting
+	+ ta ui: PB display in the browser, in its additional tab, with sorting
 
 2002-7-26 Timothee Besset <ttimo@idsoftware.com>
 	+ PB UI: for baseq3/ AND missionpack/
@@ -2775,7 +2775,7 @@
 	Can't find menu/art/unknownmap.tga
 
 	* Q3TA: after nearly 6 months, a code update from id. SOS access 
-	even. Got it to compile, link and start, but its currently broken
+	even. Got it to compile, link and start, but it's currently broken
 	(menu doesn't render in full, can't get into game etc.). Need
 	a baseline 1.17 to diff against. Last code dump was May 16, with 
 	bspc code updated May 19. Checking working directory of bk000520

reaction/README

@@ -83,9 +83,17 @@ Makefile.local:
   BUILD_SERVER       - build the 'ioq3ded' server binary
   BUILD_CLIENT       - build the 'ioquake3' client binary
   BUILD_CLIENT_SMP   - build the 'ioquake3-smp' client binary
+  BUILD_BASEGAME     - build the 'baseq3' binaries
+  BUILD_MISSIONPACK  - build the 'missionpack' binaries
   BUILD_GAME_SO      - build the game shared libraries
   BUILD_GAME_QVM     - build the game qvms
   BUILD_STANDALONE   - build binaries suited for stand-alone games
+  SERVERBIN          - rename 'ioq3ded' server binary
+  CLIENTBIN          - rename 'ioquake3' client binary
+  BASEGAME           - rename 'baseq3'
+  BASEGAME_CFLAGS    - custom CFLAGS for basegame
+  MISSIONPACK        - rename 'missionpack'
+  MISSIONPACK_CFLAGS - custom CFLAGS for missionpack (default '-DMISSIONPACK')
   USE_OPENAL         - use OpenAL where available
   USE_OPENAL_DLOPEN  - link with OpenAL at runtime
   USE_CURL           - use libcurl for http/ftp download support
@@ -95,6 +103,8 @@ Makefile.local:
   USE_VOIP           - enable built-in VoIP support
   USE_INTERNAL_SPEEX - build internal speex library instead of dynamically
                        linking against system libspeex
+  USE_OLD_VM64       - use Ludwig Nussel's old JIT compiler implementation
+                       for x86_64
   USE_INTERNAL_ZLIB  - build and link against internal zlib
   USE_INTERNAL_JPEG  - build and link against internal JPEG library
   USE_LOCAL_HEADERS  - use headers local to ioq3 instead of system ones
@@ -126,6 +136,7 @@ New cvars
                                       for forward movement speed/direction.
   j_side                            - Joystick analogue to m_side,
                                       for side movement speed/direction.
+  j_up                              - Joystick up movement speed/direction.
   j_pitch                           - Joystick analogue to m_pitch,
                                       for pitch rotation speed/direction.
   j_yaw                             - Joystick analogue to m_yaw,
@@ -134,6 +145,8 @@ New cvars
                                       controls forward/back.
   j_side_axis                       - Selects which joystick axis
                                       controls left/right.
+  j_up_axis                         - Selects which joystick axis
+                                      controls up/down.
   j_pitch_axis                      - Selects which joystick axis
                                       controls pitch.
   j_yaw_axis                        - Selects which joystick axis
@@ -647,9 +660,9 @@ Building with MinGW for pre Windows XP
 ------------------------------------------------------------- Contributing -----
 
 Please send all patches to bugzilla (https://bugzilla.icculus.org), or join the
-mailing list (quake3-subscribe@icculus.org) and submit your patch there.  The
+mailing list (http://lists.ioquake.org/listinfo.cgi/ioquake3-ioquake.org) and 
-best case scenario is that you submit your patch to bugzilla, and then post the
+submit your patch there.  The best case scenario is that you submit your patch 
-URL to the mailing list.
+to bugzilla, and then post the URL to the mailing list.
 
 The focus for ioq3 is to develop a stable base suitable for further development
 and provide players with the same Quake 3 experience they've had for years. As

reaction/make-qvm.bat

@@ -1,151 +0,0 @@
-@echo off
-cls
-
-REM *** Last updated: Jun 27 2009
-
-REM *** The first part of this batch file is dedicated to checking that your QVM compiling
-REM *** environment is set up properly and double-checking that it is because you are an
-REM *** end-user and not to be trusted!
-
-
-REM *** Tell the batch file where it is located.
-REM *** Typically this will be something like c:\code\reaction\
-REM *** but you can put in whatever you want, like make-qvm-location="c:\reaction code\"
-REM *** Remember to add in a trailing backslash \ at the end of the path!
-
-set make-qvm-location=%~dp0
-
-
-REM *** Check to see if the location of make-qvm.bat is valid.  It is required for this batch file.
-
-IF NOT EXIST "%make-qvm-location%"make-qvm.bat (
-echo.
-echo make-qvm.bat not found where it was expected!  
-echo Edit this batch file and/or rename your folder!
-echo Expected to find make-qvm.bat at: 
-echo %make-qvm-location%make-qvm.bat
-echo.
-GOTO END
-)
-
-
-REM *** Tell the batch files where you have installed 7-zip.  
-REM *** %PROGRAMFILES% is typically something like "C:\Program Files\"
-REM *** but you can put in whatever you want, like zipper="f:\download files\7zip\7z.exe"
-
-set zipper=%PROGRAMFILES%\7-Zip\7z.exe
-
-
-REM *** Check to see if 7-zip is installed.  It is required for this batch file.
-
-IF NOT EXIST "%zipper%" (
-echo.
-echo 7-Zip not found where it was expected!  
-echo Edit this batch file and/or install 7-zip!
-echo Expected to find 7z.exe at: 
-echo %PROGRAMFILES%\7-Zip\7z.exe
-echo.
-GOTO END
-)
-
-
-REM *** Check to see if the location of lcc.exe is valid.  It is required for this batch file.
-
-IF NOT EXIST "%make-qvm-location%"bin\tools\q3lcc.exe (
-echo.
-echo lcc.exe not found where it was expected!  
-echo Edit this batch file and/or rename your folder!
-echo Expected to find make-qvm.bat at: 
-echo %make-qvm-location%bin\tools\q3lcc.exe
-echo.
-GOTO END
-)
-
-REM *** Check to see if the location of q3asm.exe is valid.  It is required for this batch file.
-
-IF NOT EXIST "%make-qvm-location%"bin\tools\q3asm.exe (
-echo.
-echo q3asm.exe not found where it was expected!  
-echo Edit this batch file and/or rename your folder!
-echo Expected to find make-qvm.bat at: 
-echo %make-qvm-location%bin\tools\q3asm.exe
-echo.
-GOTO END
-)
-
-
-REM *** Put the tools folder in the path; used in the separate batch files called below.
-set PATH=%PATH%;%make-qvm-location%bin\tools\
-
-
-REM *** Feedback for what this batch file is using/expecting.
-echo.
-echo This batch file's defined location: 
-echo %make-qvm-location%
-echo.
-echo 7-zip's defined location: 
-echo %zipper%
-echo.
-
-
-REM *** Removing any previous QVM files.
-echo.
-echo *** Removing any previous QVM files.
-del "%make-qvm-location%bin\qvm\vm\*.map"
-del "%make-qvm-location%bin\qvm\vm\*.qvm"
-del "%make-qvm-location%code\cgame\vm\*.asm"
-del "%make-qvm-location%code\game\vm\*.asm"
-del "%make-qvm-location%code\ui\vm\*.asm"
-
-
-REM *** Generating the QVMs
-REM *** Note: Q3_UI is not used by Reaction so is not compiled or included in the source.
-echo.
-echo *** Generating the QVMs
-echo.
-echo.
-echo *** Generating CGAME...
-cd "%make-qvm-location%"code\cgame
-call make-cgame.bat
-cd..
-echo.
-echo *** Generating GAME/QAGAME...
-cd "%make-qvm-location%"code\game
-call make-game.bat
-cd..
-echo.
-echo *** Generating UI...
-cd "%make-qvm-location%"code\ui
-call make-ui.bat
-cd..
-
-
-REM *** Remove any old pk3 and create a new one.
-REM *** The pk3 is named like it is so it is always loaded last for testing.
-
-echo.
-echo *** Remove any old pk3 and create a new one...
-echo.
-set zipname=%make-qvm-location%bin\qvm\zzzz-code-*.pk3
-del "%zipname%"
-set zipname=%make-qvm-location%bin\qvm\zzzz-code-%date:~-4,4%%date:~-7,2%%date:~-10,2%.pk3
-cd "%make-qvm-location%bin\qvm"
-copy /y "%make-qvm-location%uifiles\*.menu" "%make-qvm-location%bin\qvm\ui"
-copy /y "%make-qvm-location%uifiles\*.h" "%make-qvm-location%bin\qvm\ui"
-copy /y "%make-qvm-location%uifiles\menus.txt" "%make-qvm-location%bin\qvm\ui"
-copy /y "%make-qvm-location%uifiles\ingame.txt" "%make-qvm-location%bin\qvm\ui"
-"%zipper%" a -tzip "%zipname%" vm\*.qvm
-"%zipper%" a -tzip "%zipname%" ui\*.menu
-"%zipper%" a -tzip "%zipname%" ui\*.h
-"%zipper%" a -tzip "%zipname%" ui\menus.txt
-"%zipper%" a -tzip "%zipname%" ui\ingame.txt
-
-:END
-echo.
-echo.
-echo.
-echo You might wish to scroll up and check for any warnings or fatal errors before 
-echo you press any key and this window closes...
-echo.
-echo.
-pause