diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-26 20:09:18 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-26 20:09:18 +0000 |
| commit | b05dd1308c95aa8819fa50aaefd7a8bdda741f4a (patch) | |
| tree | b7ea6c7ce8ccc9d06f079e2c4a21e40e745fc97f | |
| parent | 6addebda62ab0c65c7f587b2fef7fb22c3340d41 (diff) | |
| download | ioquake3-aero-b05dd1308c95aa8819fa50aaefd7a8bdda741f4a.tar.gz ioquake3-aero-b05dd1308c95aa8819fa50aaefd7a8bdda741f4a.zip | |
* Some FreeBSD cleanups
* Removed the remainder of the RPM stuff from the Makefile
git-svn-id: svn://svn.icculus.org/quake3/trunk@113 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/game/q_shared.h | 4 | ||||
| -rw-r--r-- | code/unix/Makefile | 10 |
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 |