mirror of
https://github.com/UberGames/ioef.git
synced 2024-11-27 22:42:09 +00:00
* Some FreeBSD cleanups
* Removed the remainder of the RPM stuff from the Makefile
This commit is contained in:
parent
cde9e9e93c
commit
909e96e41b
2 changed files with 4 additions and 10 deletions
|
@ -333,9 +333,9 @@ inline static float LittleFloat (const float l) { return FloatSwap(&l); }
|
||||||
#if !idppc
|
#if !idppc
|
||||||
static short BigShort( short l) { return ShortSwap(l); }
|
static short BigShort( short l) { return ShortSwap(l); }
|
||||||
#define LittleShort
|
#define LittleShort
|
||||||
static int BigLong(int l) { LongSwap(l); }
|
static int BigLong(int l) { return LongSwap(l); }
|
||||||
#define LittleLong
|
#define LittleLong
|
||||||
static float BigFloat(const float l) { FloatSwap(&l); }
|
static float BigFloat(const float l) { return FloatSwap(&l); }
|
||||||
#define LittleFloat
|
#define LittleFloat
|
||||||
#else
|
#else
|
||||||
#define BigShort
|
#define BigShort
|
||||||
|
|
|
@ -73,7 +73,6 @@ SPLNDIR=$(MOUNT_DIR)/splines
|
||||||
# extract version info
|
# extract version info
|
||||||
VERSION=$(shell grep Q3_VERSION ../game/q_shared.h | \
|
VERSION=$(shell grep Q3_VERSION ../game/q_shared.h | \
|
||||||
sed -e 's/.*Q3\ \(.*\)"/\1/')
|
sed -e 's/.*Q3\ \(.*\)"/\1/')
|
||||||
RPM_RELEASE=1
|
|
||||||
|
|
||||||
#############################################################################
|
#############################################################################
|
||||||
# SETUP AND BUILD -- LINUX
|
# SETUP AND BUILD -- LINUX
|
||||||
|
@ -93,7 +92,6 @@ ifeq ($(PLATFORM),linux)
|
||||||
CC=gcc
|
CC=gcc
|
||||||
CXX=g++
|
CXX=g++
|
||||||
|
|
||||||
RPMARCH=$(ARCH)
|
|
||||||
ifeq ($(ARCH),alpha)
|
ifeq ($(ARCH),alpha)
|
||||||
ARCH=axp
|
ARCH=axp
|
||||||
else
|
else
|
||||||
|
@ -231,8 +229,6 @@ ifeq ($(PLATFORM),mingw32)
|
||||||
ARCH=x86
|
ARCH=x86
|
||||||
endif
|
endif
|
||||||
|
|
||||||
RPMARCH=$(ARCH)
|
|
||||||
|
|
||||||
BASE_CFLAGS = -pipe -Wall -Wimplicit -Wstrict-prototypes
|
BASE_CFLAGS = -pipe -Wall -Wimplicit -Wstrict-prototypes
|
||||||
|
|
||||||
ifeq ($(strip $(DLL_ONLY)),true)
|
ifeq ($(strip $(DLL_ONLY)),true)
|
||||||
|
@ -304,18 +300,16 @@ ifeq ($(PLATFORM),freebsd)
|
||||||
|
|
||||||
ifneq (,$(findstring alpha,$(shell uname -m)))
|
ifneq (,$(findstring alpha,$(shell uname -m)))
|
||||||
ARCH=axp
|
ARCH=axp
|
||||||
RPMARCH=alpha
|
|
||||||
else #default to i386
|
else #default to i386
|
||||||
ARCH=i386
|
ARCH=i386
|
||||||
RPMARCH=i386
|
|
||||||
endif #alpha test
|
endif #alpha test
|
||||||
|
|
||||||
|
|
||||||
BASE_CFLAGS = -pipe
|
BASE_CFLAGS = -pipe -Wall
|
||||||
|
|
||||||
GL_CFLAGS = -I/usr/X11R6/include
|
GL_CFLAGS = -I/usr/X11R6/include
|
||||||
|
|
||||||
DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror
|
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
|
||||||
|
|
||||||
ifeq ($(ARCH),axp)
|
ifeq ($(ARCH),axp)
|
||||||
CC=gcc
|
CC=gcc
|
||||||
|
|
Loading…
Reference in a new issue