mirror of https://github.com/ioquake/ioq3.git
Assorted whitespace fixes
This commit is contained in:
Tim Angus
parent
631db38d25
commit
6999fdba91
66
Makefile
66
Makefile
|
|
@ -402,7 +402,7 @@ ifeq ($(PLATFORM),darwin)
|
|||
CLIENT_LIBS=
|
||||
RENDERER_LIBS=
|
||||
OPTIMIZEVM=
|
||||
|
||||
|
||||
BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
|
||||
|
||||
ifeq ($(ARCH),ppc)
|
||||
|
|
@ -502,7 +502,7 @@ ifeq ($(PLATFORM),mingw32)
|
|||
CLIENT_LDFLAGS += $(OPENAL_LDFLAGS)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(ARCH),x64)
|
||||
OPTIMIZEVM = -O3 -fno-omit-frame-pointer \
|
||||
-falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
|
||||
|
|
@ -528,7 +528,7 @@ ifeq ($(PLATFORM),mingw32)
|
|||
CLIENT_LDFLAGS += -mwindows
|
||||
CLIENT_LIBS = -lgdi32 -lole32
|
||||
RENDERER_LIBS = -lgdi32 -lole32 -lopengl32
|
||||
|
||||
|
||||
ifeq ($(USE_FREETYPE),1)
|
||||
BASE_CFLAGS += -Ifreetype2
|
||||
endif
|
||||
|
|
@ -563,7 +563,7 @@ ifeq ($(PLATFORM),mingw32)
|
|||
# libmingw32 must be linked before libSDLmain
|
||||
CLIENT_LIBS += -lmingw32
|
||||
RENDERER_LIBS += -lmingw32
|
||||
|
||||
|
||||
ifeq ($(USE_LOCAL_HEADERS),1)
|
||||
CLIENT_CFLAGS += -I$(SDLHDIR)/include
|
||||
ifeq ($(ARCH), x86)
|
||||
|
|
@ -692,7 +692,7 @@ ifeq ($(PLATFORM),openbsd)
|
|||
CLIENT_LIBS += -lvorbisfile -lvorbis -logg
|
||||
endif
|
||||
|
||||
ifeq ($(USE_CURL),1)
|
||||
ifeq ($(USE_CURL),1)
|
||||
ifneq ($(USE_CURL_DLOPEN),1)
|
||||
CLIENT_LIBS += -lcurl
|
||||
endif
|
||||
|
|
@ -741,7 +741,7 @@ ifeq ($(PLATFORM),irix64)
|
|||
-I. -I$(ROOT)/usr/include
|
||||
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
||||
OPTIMIZE = -O3
|
||||
|
||||
|
||||
SHLIBEXT=so
|
||||
SHLIBCFLAGS=
|
||||
SHLIBLDFLAGS=-shared
|
||||
|
|
@ -799,7 +799,7 @@ ifeq ($(PLATFORM),sunos)
|
|||
CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
||||
|
||||
SHLIBEXT=so
|
||||
|
|
@ -887,15 +887,15 @@ endif
|
|||
ifneq ($(BUILD_GAME_SO),0)
|
||||
ifneq ($(BUILD_BASEGAME),0)
|
||||
TARGETS += \
|
||||
$(B)/$(BASEGAME)/cgame$(SHLIBNAME) \
|
||||
$(B)/$(BASEGAME)/qagame$(SHLIBNAME) \
|
||||
$(B)/$(BASEGAME)/ui$(SHLIBNAME)
|
||||
$(B)/$(BASEGAME)/cgame$(SHLIBNAME) \
|
||||
$(B)/$(BASEGAME)/qagame$(SHLIBNAME) \
|
||||
$(B)/$(BASEGAME)/ui$(SHLIBNAME)
|
||||
endif
|
||||
ifneq ($(BUILD_MISSIONPACK),0)
|
||||
TARGETS += \
|
||||
$(B)/$(MISSIONPACK)/cgame$(SHLIBNAME) \
|
||||
$(B)/$(MISSIONPACK)/qagame$(SHLIBNAME) \
|
||||
$(B)/$(MISSIONPACK)/ui$(SHLIBNAME)
|
||||
$(B)/$(MISSIONPACK)/cgame$(SHLIBNAME) \
|
||||
$(B)/$(MISSIONPACK)/qagame$(SHLIBNAME) \
|
||||
$(B)/$(MISSIONPACK)/ui$(SHLIBNAME)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -906,7 +906,7 @@ ifneq ($(BUILD_GAME_QVM),0)
|
|||
$(B)/$(BASEGAME)/vm/cgame.qvm \
|
||||
$(B)/$(BASEGAME)/vm/qagame.qvm \
|
||||
$(B)/$(BASEGAME)/vm/ui.qvm
|
||||
endif
|
||||
endif
|
||||
ifneq ($(BUILD_MISSIONPACK),0)
|
||||
TARGETS += \
|
||||
$(B)/$(MISSIONPACK)/vm/qagame.qvm \
|
||||
|
|
@ -1228,7 +1228,7 @@ TOOLS_LIBS =
|
|||
TOOLS_LDFLAGS =
|
||||
|
||||
ifeq ($(GENERATE_DEPENDENCIES),1)
|
||||
TOOLS_CFLAGS += -MMD
|
||||
TOOLS_CFLAGS += -MMD
|
||||
endif
|
||||
|
||||
define DO_TOOLS_CC
|
||||
|
|
@ -1249,8 +1249,8 @@ Q3LCC = $(B)/tools/q3lcc$(BINEXT)
|
|||
Q3ASM = $(B)/tools/q3asm$(BINEXT)
|
||||
|
||||
LBURGOBJ= \
|
||||
$(B)/tools/lburg/lburg.o \
|
||||
$(B)/tools/lburg/gram.o
|
||||
$(B)/tools/lburg/lburg.o \
|
||||
$(B)/tools/lburg/gram.o
|
||||
|
||||
$(B)/tools/lburg/%.o: $(LBURGDIR)/%.c
|
||||
$(DO_TOOLS_CC)
|
||||
|
|
@ -1305,16 +1305,16 @@ $(Q3RCC): $(Q3RCCOBJ)
|
|||
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $^ $(TOOLS_LIBS)
|
||||
|
||||
Q3CPPOBJ = \
|
||||
$(B)/tools/cpp/cpp.o \
|
||||
$(B)/tools/cpp/lex.o \
|
||||
$(B)/tools/cpp/nlist.o \
|
||||
$(B)/tools/cpp/tokens.o \
|
||||
$(B)/tools/cpp/macro.o \
|
||||
$(B)/tools/cpp/eval.o \
|
||||
$(B)/tools/cpp/include.o \
|
||||
$(B)/tools/cpp/hideset.o \
|
||||
$(B)/tools/cpp/getopt.o \
|
||||
$(B)/tools/cpp/unix.o
|
||||
$(B)/tools/cpp/cpp.o \
|
||||
$(B)/tools/cpp/lex.o \
|
||||
$(B)/tools/cpp/nlist.o \
|
||||
$(B)/tools/cpp/tokens.o \
|
||||
$(B)/tools/cpp/macro.o \
|
||||
$(B)/tools/cpp/eval.o \
|
||||
$(B)/tools/cpp/include.o \
|
||||
$(B)/tools/cpp/hideset.o \
|
||||
$(B)/tools/cpp/getopt.o \
|
||||
$(B)/tools/cpp/unix.o
|
||||
|
||||
$(B)/tools/cpp/%.o: $(Q3CPPDIR)/%.c
|
||||
$(DO_TOOLS_CC)
|
||||
|
|
@ -1493,10 +1493,10 @@ Q3OBJ = \
|
|||
|
||||
ifeq ($(PLATFORM),mingw32)
|
||||
Q3OBJ += \
|
||||
$(B)/client/con_passive.o
|
||||
$(B)/client/con_passive.o
|
||||
else
|
||||
Q3OBJ += \
|
||||
$(B)/client/con_tty.o
|
||||
$(B)/client/con_tty.o
|
||||
endif
|
||||
|
||||
Q3R2OBJ = \
|
||||
|
|
@ -1537,7 +1537,7 @@ Q3R2OBJ = \
|
|||
$(B)/rend2/tr_world.o \
|
||||
\
|
||||
$(B)/renderer/sdl_gamma.o
|
||||
|
||||
|
||||
Q3R2STRINGOBJ = \
|
||||
$(B)/rend2/glsl/bokeh_fp.o \
|
||||
$(B)/rend2/glsl/bokeh_vp.o \
|
||||
|
|
@ -1978,17 +1978,17 @@ endif
|
|||
ifeq ($(ARCH),x86_64)
|
||||
Q3DOBJ += \
|
||||
$(B)/ded/snapvector.o \
|
||||
$(B)/ded/ftola.o
|
||||
$(B)/ded/ftola.o
|
||||
endif
|
||||
ifeq ($(ARCH),amd64)
|
||||
Q3DOBJ += \
|
||||
$(B)/ded/snapvector.o \
|
||||
$(B)/ded/ftola.o
|
||||
$(B)/ded/ftola.o
|
||||
endif
|
||||
ifeq ($(ARCH),x64)
|
||||
Q3DOBJ += \
|
||||
$(B)/ded/snapvector.o \
|
||||
$(B)/ded/ftola.o
|
||||
$(B)/ded/ftola.o
|
||||
endif
|
||||
|
||||
ifeq ($(USE_INTERNAL_ZLIB),1)
|
||||
|
|
|
|||
Loading…
Reference in New Issue