aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
Diffstat (limited to 'code')
-rw-r--r--code/game/q_shared.h4
-rw-r--r--code/unix/Makefile10
2 files changed, 4 insertions, 10 deletions
diff --git a/code/game/q_shared.h b/code/game/q_shared.h
index c3a803c..7ca448a 100644
--- a/code/game/q_shared.h
+++ b/code/game/q_shared.h
@@ -333,9 +333,9 @@ inline static float LittleFloat (const float l) { return FloatSwap(&l); }
#if !idppc
static short BigShort( short l) { return ShortSwap(l); }
#define LittleShort
-static int BigLong(int l) { LongSwap(l); }
+static int BigLong(int l) { return LongSwap(l); }
#define LittleLong
-static float BigFloat(const float l) { FloatSwap(&l); }
+static float BigFloat(const float l) { return FloatSwap(&l); }
#define LittleFloat
#else
#define BigShort
diff --git a/code/unix/Makefile b/code/unix/Makefile
index f14c97f..378f9eb 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -73,7 +73,6 @@ SPLNDIR=$(MOUNT_DIR)/splines
# extract version info
VERSION=$(shell grep Q3_VERSION ../game/q_shared.h | \
sed -e 's/.*Q3\ \(.*\)"/\1/')
-RPM_RELEASE=1
#############################################################################
# SETUP AND BUILD -- LINUX
@@ -93,7 +92,6 @@ ifeq ($(PLATFORM),linux)
CC=gcc
CXX=g++
- RPMARCH=$(ARCH)
ifeq ($(ARCH),alpha)
ARCH=axp
else
@@ -231,8 +229,6 @@ ifeq ($(PLATFORM),mingw32)
ARCH=x86
endif
- RPMARCH=$(ARCH)
-
BASE_CFLAGS = -pipe -Wall -Wimplicit -Wstrict-prototypes
ifeq ($(strip $(DLL_ONLY)),true)
@@ -304,18 +300,16 @@ ifeq ($(PLATFORM),freebsd)
ifneq (,$(findstring alpha,$(shell uname -m)))
ARCH=axp
- RPMARCH=alpha
else #default to i386
ARCH=i386
- RPMARCH=i386
endif #alpha test
- BASE_CFLAGS = -pipe
+ BASE_CFLAGS = -pipe -Wall
GL_CFLAGS = -I/usr/X11R6/include
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror
+ DEBUG_CFLAGS=$(BASE_CFLAGS) -g
ifeq ($(ARCH),axp)
CC=gcc