[quake3-commits] r2040 - in trunk: . code/cgame

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-06-16 18:50:33 -0400 (Thu, 16 Jun 2011)
New Revision: 2040

Modified:
   trunk/Makefile
   trunk/code/cgame/cg_particles.c
   trunk/cross-make-mingw.sh
   trunk/cross-make-mingw64.sh
Log:
Fixes for bugs introduced in last several revisions


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-06-16 22:28:13 UTC (rev 2039)
+++ trunk/Makefile	2011-06-16 22:50:33 UTC (rev 2040)
@@ -1885,7 +1885,7 @@
   $(B)/baseq3/cgame/cg_info.o \
   $(B)/baseq3/cgame/cg_localents.o \
   $(B)/baseq3/cgame/cg_marks.o \
-  $(B)/baseq3/cgame/cg_particles.o \ 
+  $(B)/baseq3/cgame/cg_particles.o \
   $(B)/baseq3/cgame/cg_players.o \
   $(B)/baseq3/cgame/cg_playerstate.o \
   $(B)/baseq3/cgame/cg_predict.o \

Modified: trunk/code/cgame/cg_particles.c
===================================================================
--- trunk/code/cgame/cg_particles.c	2011-06-16 22:28:13 UTC (rev 2039)
+++ trunk/code/cgame/cg_particles.c	2011-06-16 22:50:33 UTC (rev 2040)
@@ -141,7 +141,8 @@
 #ifdef WOLF_PARTICLES
 #define		MAX_PARTICLES	1024 * 8
 #else
-#define		WOLF_PARTICLES 1024
+#define		MAX_PARTICLES 1024
+#endif
 
 cparticle_t	*active_particles, *free_particles;
 cparticle_t	particles[MAX_PARTICLES];

Modified: trunk/cross-make-mingw.sh
===================================================================
--- trunk/cross-make-mingw.sh	2011-06-16 22:28:13 UTC (rev 2039)
+++ trunk/cross-make-mingw.sh	2011-06-16 22:50:33 UTC (rev 2040)
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-export CC=i586-mingw32msvc-gcc
-export WINDRES=i586-mingw32msvc-windres
+if [ !$CC ]
+then
+  export CC=i586-mingw32msvc-gcc
+fi
+
+if [ !$WINDRES ]
+then
+  export WINDRES=i586-mingw32msvc-windres
+fi
+
 export PLATFORM=mingw32
-if [ !$ARCH ]
-then
 export ARCH=x86
-fi
+
 exec make $*

Modified: trunk/cross-make-mingw64.sh
===================================================================
--- trunk/cross-make-mingw64.sh	2011-06-16 22:28:13 UTC (rev 2039)
+++ trunk/cross-make-mingw64.sh	2011-06-16 22:50:33 UTC (rev 2040)
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-export CC=amd64-mingw32msvc-gcc
-export WINDRES=amd64-mingw32msvc-windres
+if [ !$CC ]
+then
+  export CC=amd64-mingw32msvc-gcc
+fi
+
+if [ !$WINDRES ]
+then
+  export WINDRES=amd64-mingw32msvc-windres
+fi
+
 export PLATFORM=mingw32
-if [ !$ARCH ]
-then
 export ARCH=x86_64
-fi
+
 exec make $*