diff options
| -rw-r--r-- | Makefile | 50 |
1 files changed, 22 insertions, 28 deletions
@@ -41,12 +41,6 @@ endif ifndef BUILD_GAME_QVM BUILD_GAME_QVM = endif -ifndef BUILD_BASEGAME - BUILD_BASEGAME = -endif -ifndef BUILD_MISSIONPACK - BUILD_MISSIONPACK= -endif ifndef BUILD_RENDERER_REND2 BUILD_RENDERER_REND2= endif @@ -493,7 +487,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 \ @@ -519,7 +513,7 @@ ifeq ($(PLATFORM),mingw32) CLIENT_LDFLAGS += -mwindows CLIENT_LIBS = -lgdi32 -lole32 RENDERER_LIBS = -lgdi32 -lole32 -lopengl32 - + ifeq ($(USE_FREETYPE),1) BASE_CFLAGS += -Ifreetype2 endif @@ -554,7 +548,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) @@ -683,7 +677,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 @@ -729,7 +723,7 @@ ifeq ($(PLATFORM),irix64) -I. -I$(ROOT)/usr/include CLIENT_CFLAGS += $(SDL_CFLAGS) OPTIMIZE = -O3 - + SHLIBEXT=so SHLIBCFLAGS= SHLIBLDFLAGS=-shared @@ -787,7 +781,7 @@ ifeq ($(PLATFORM),sunos) CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA endif endif - + OPTIMIZE = $(OPTIMIZEVM) -ffast-math SHLIBEXT=so @@ -1171,7 +1165,7 @@ TOOLS_LIBS = TOOLS_LDFLAGS = ifeq ($(GENERATE_DEPENDENCIES),1) - TOOLS_CFLAGS += -MMD + TOOLS_CFLAGS += -MMD endif define DO_TOOLS_CC @@ -1192,8 +1186,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) @@ -1248,16 +1242,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) @@ -1388,10 +1382,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 = \ @@ -1432,7 +1426,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 \ |