From 115d513db8615c67aba87278115dfb416a32e29a Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Tue, 29 May 2007 19:22:24 +0000
Subject: * Allow CC to be overridden externally to the Makefile * Make
 cross-make-mingw.sh more generic using the above * Update README to reflect
 changes * Fix a couple of warnings in the Windows input layer

git-svn-id: svn://svn.icculus.org/quake3/trunk@1090 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 Makefile               | 18 +++++++-----------
 README                 |  9 ++++++---
 code/win32/win_input.c |  7 ++++---
 cross-make-mingw.sh    |  6 ++----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index cdd083a..646e59d 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,10 @@ ifndef ARCH
 ARCH=$(COMPILE_ARCH)
 endif
 
+ifndef CC
+CC=gcc
+endif
+
 ifeq ($(ARCH),powerpc)
   ARCH=ppc
 endif
@@ -173,8 +177,6 @@ MKDIR=mkdir
 
 ifeq ($(PLATFORM),linux)
 
-  CC=gcc
-
   ifeq ($(ARCH),alpha)
     ARCH=axp
   else
@@ -292,7 +294,6 @@ else # ifeq Linux
 #############################################################################
 
 ifeq ($(PLATFORM),darwin)
-  CC=gcc
   VM_PPC=vm_ppc_new
   HAVE_VM_COMPILED=true
   BASE_CFLAGS=
@@ -428,8 +429,9 @@ else # ifeq darwin
 
 ifeq ($(PLATFORM),mingw32)
 
-  CC=gcc
-  WINDRES=windres
+ifndef WINDRES
+WINDRES=windres
+endif
 
   ARCH=x86
 
@@ -527,13 +529,11 @@ ifeq ($(PLATFORM),freebsd)
   endif
 
   ifeq ($(ARCH),axp)
-    CC=gcc
     BASE_CFLAGS += -DNO_VM_COMPILED
     RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
       -fomit-frame-pointer -fexpensive-optimizations
   else
   ifeq ($(ARCH),i386)
-    CC=gcc
     RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
       -march=pentium -fomit-frame-pointer -pipe -ffast-math \
       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
@@ -583,7 +583,6 @@ ifeq ($(PLATFORM),netbsd)
     ARCH=i386
   endif
 
-  CC=gcc
   LDFLAGS=-lm
   SHLIBEXT=so
   SHLIBCFLAGS=-fPIC
@@ -610,7 +609,6 @@ ifeq ($(PLATFORM),irix)
 
   ARCH=mips  #default to MIPS
 
-  CC=cc
   BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 -mips3 \
     -nostdinc -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED
   RELEASE_CFLAGS=$(BASE_CFLAGS) -O3
@@ -631,7 +629,6 @@ else # ifeq IRIX
 
 ifeq ($(PLATFORM),sunos)
 
-  CC=gcc
   INSTALL=ginstall
   MKDIR=gmkdir
   COPYDIR="/usr/local/share/games/quake3"
@@ -705,7 +702,6 @@ else # ifeq sunos
 #############################################################################
 # SETUP AND BUILD -- GENERIC
 #############################################################################
-  CC=cc
   BASE_CFLAGS=-DNO_VM_COMPILED
   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3
diff --git a/README b/README
index da52d20..ab96322 100644
--- a/README
+++ b/README
@@ -75,9 +75,12 @@ Installation, for *nix
 It is also possible to cross compile for Windows under *nix using MinGW. A
 script is available to build a cross compilation environment from
 http://www.libsdl.org/extras/win32/cross/build-cross.sh. The gcc/binutils
-version numbers that the script downloads may need to be altered. After you
-have successfully run this script cross compiling is simply a case of using
-'./cross-make-mingw.sh' in place of 'make'.
+version numbers that the script downloads may need to be altered.
+Alternatively, your distribution may have mingw32 packages available. On
+debian/Ubuntu, these are mingw32, mingw32-runtime and mingw32-binutils. Cross
+compiling is simply a case of using './cross-make-mingw.sh' in place of 'make',
+though you may find you need to change the value of the variables in this
+script to match your environment.
 
 If the make based build system is being used (i.e. *nix or MinGW), the
 following variables may be set, either on the command line or in
diff --git a/code/win32/win_input.c b/code/win32/win_input.c
index a255211..ddb1165 100644
--- a/code/win32/win_input.c
+++ b/code/win32/win_input.c
@@ -937,8 +937,8 @@ void IN_JoyMove( void ) {
 
 	if ( in_debugJoystick->integer ) {
 		Com_Printf( "%8x %5i %5.2f %5.2f %5.2f %5.2f %6i %6i\n", 
-			joy.ji.dwButtons,
-			joy.ji.dwPOV,
+			JoyToI( joy.ji.dwButtons ),
+			JoyToI( joy.ji.dwPOV ),
 			JoyToF( joy.ji.dwXpos ), JoyToF( joy.ji.dwYpos ),
 			JoyToF( joy.ji.dwZpos ), JoyToF( joy.ji.dwRpos ),
 			JoyToI( joy.ji.dwUpos ), JoyToI( joy.ji.dwVpos ) );
@@ -1130,7 +1130,8 @@ static void IN_StartupMIDI( void )
 					 ( unsigned long ) NULL,
 					 CALLBACK_FUNCTION ) != MMSYSERR_NOERROR )
 	{
-		Com_Printf( "WARNING: could not open MIDI device %d: '%s'\n", in_mididevice->integer , s_midiInfo.caps[( int ) in_mididevice->value] );
+		Com_Printf( "WARNING: could not open MIDI device %d: '%s'\n",
+                in_mididevice->integer , s_midiInfo.caps[( int ) in_mididevice->value].szPname );
 		return;
 	}
 
diff --git a/cross-make-mingw.sh b/cross-make-mingw.sh
index bb9c23e..c6dbe37 100755
--- a/cross-make-mingw.sh
+++ b/cross-make-mingw.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-PREFIX=/usr/local/cross-tools
-TARGET=i386-mingw32msvc
-PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PATH"
-export PATH
+export CC=i586-mingw32msvc-gcc
+export WINDRES=i586-mingw32msvc-windres
 export PLATFORM=mingw32
 exec make $*
-- 
cgit v1.2.3