libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2025-02-14 12:48:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
libretro-tyrquake/Makefile

899 lines
20 KiB
Makefile
Raw Normal View History

Import v0.47 sources
2006-09-10 19:02:51 +09:30
#
[PATCH] Add automatic dependency generation This is a first pass at getting automatic file dependencies generated. We use gcc's -M options to have it generate the makefile rules for each object file. The rule for and object file OBJ is stored in the file .OBJ.d. The dependecy file is automatically updated whenever the object file gets updated. I think this can be cleaned up quite a bit (there seems to be a lot of redundancy in there), but it's working right now and I want to get something committed. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:56 +09:30
# TyrQuake Makefile (tested under Linux and MinGW/Msys)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
#
[PATCH] Add automatic dependency generation This is a first pass at getting automatic file dependencies generated. We use gcc's -M options to have it generate the makefile rules for each object file. The rule for and object file OBJ is stored in the file .OBJ.d. The dependecy file is automatically updated whenever the object file gets updated. I think this can be cleaned up quite a bit (there seems to be a lot of redundancy in there), but it's working right now and I want to get something committed. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:56 +09:30
# By default, all executables will be built. If you want to just build one,
# just type e.g. "make tyr-quake". If the build dirs haven't been created yet,
# you might need to type "make prepare" first.
#
# Options:
# --------
# To build an executable with debugging symbols, un-comment the DEBUG=Y option
# below. You should "make clean" when switching this option on or off.
#
# To build an executable without using any of the hand written x86 assembler,
# un-comment the NO_X86_ASM option below. You should "make clean" when
# switching this option on or off.
Import v0.47 sources
2006-09-10 19:02:51 +09:30
#
TYR_VERSION_MAJOR = 0
[PATCH] TyrQuake v0.54 Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-16 07:06:02 +09:30
TYR_VERSION_MINOR = 54
Import v0.47 sources
2006-09-10 19:02:51 +09:30
TYR_VERSION_BUILD =
TYR_VERSION = $(TYR_VERSION_MAJOR).$(TYR_VERSION_MINOR)$(TYR_VERSION_BUILD)
# ============================================================================
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
# User configurable options here:
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# ============================================================================
#DEBUG=y # Compile with debug info
#NO_X86_ASM=y # Compile with no x86 asm
# ============================================================================
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
BUILD_DIR = build
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
.PHONY: default clean
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# ============================================================================
# FIXME - how to detect build env reliably...?
ifeq ($(OSTYPE),msys)
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
TARGET_OS = WIN32
Import v0.47 sources
2006-09-10 19:02:51 +09:30
TOPDIR := $(shell pwd -W)
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
EXT = .exe
Import v0.47 sources
2006-09-10 19:02:51 +09:30
else
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
TARGET_OS = LINUX
Import v0.47 sources
2006-09-10 19:02:51 +09:30
TOPDIR := $(shell pwd)
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
EXT =
Import v0.47 sources
2006-09-10 19:02:51 +09:30
endif
[PATCH] Work around compiler bug After upgrading my MinGW installation, TyrQuake started to crash in a very strange way. Eventually, tracked it down to gcc's unit-at-a-time optimisation. This patch disables unit-at-a-time for gcc earlier than 4.0. (Current MinGW is 3.4.5). Version checking script shamelessly stolen from Linux. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:12:09 +09:30
# ============================================================================
# Helper functions
# ============================================================================
cc-version = $(shell sh $(TOPDIR)/scripts/gcc-version \
$(if $(1), $(1), $(CC)))
cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
> /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
GCC_VERSION := $(call cc-version)
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
# ---------------------
# Special include dirs
# ---------------------
Import v0.47 sources
2006-09-10 19:02:51 +09:30
DX_INC = $(TOPDIR)/dxsdk/sdk/inc
ST_INC = $(TOPDIR)/scitech/include
# --------------
# Library stuff
# --------------
NQ_ST_LIBDIR = scitech/lib/win32/vc
QW_ST_LIBDIR = scitech/lib/win32/vc
NQ_W32_COMMON_LIBS = wsock32 winmm dxguid
NQ_W32_SW_LIBS = mgllt ddraw
NQ_W32_GL_LIBS = opengl32 comctl32
LINUX_X11_LIBDIR = /usr/X11R6/lib
NQ_LINUX_COMMON_LIBS = m X11 Xext Xxf86dga Xxf86vm
NQ_LINUX_GL_LIBS = GL
[PATCH] Move -mwindows inside the do_cc_link call Doesn't entirely belong in LFLAGS and besides, it shrinks some overly long lines. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:59 +09:30
NQ_W32_SW_LFLAGS = $(patsubst %,-l%,$(NQ_W32_SW_LIBS) $(NQ_W32_COMMON_LIBS))
NQ_W32_GL_LFLAGS = $(patsubst %,-l%,$(NQ_W32_GL_LIBS) $(NQ_W32_COMMON_LIBS))
Import v0.47 sources
2006-09-10 19:02:51 +09:30
NQ_LINUX_SW_LFLAGS = $(patsubst %,-l%,$(NQ_LINUX_COMMON_LIBS))
NQ_LINUX_GL_LFLAGS = $(patsubst %,-l%,$(NQ_LINUX_COMMON_LIBS) $(NQ_LINUX_GL_LIBS))
# ---------------------------------------
# Define some build variables
# ---------------------------------------
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
STRIP ?= strip
Import v0.47 sources
2006-09-10 19:02:51 +09:30
CFLAGS := -Wall -Wno-trigraphs
[PATCH] Small Makefile cleanups * Clean up some unnecessary GCC version checking * Don't ship with -Werror enabled Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:06:09 +09:30
# Enable this if you're getting pedantic again...
#ifeq ($(TARGET_OS),LINUX)
#CFLAGS += -Werror
#endif
Import v0.47 sources
2006-09-10 19:02:51 +09:30
ifdef DEBUG
CFLAGS += -g
else
CFLAGS += -O2
[PATCH] Work around compiler bug After upgrading my MinGW installation, TyrQuake started to crash in a very strange way. Eventually, tracked it down to gcc's unit-at-a-time optimisation. This patch disables unit-at-a-time for gcc earlier than 4.0. (Current MinGW is 3.4.5). Version checking script shamelessly stolen from Linux. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:12:09 +09:30
# -funit-at-a-time is buggy for MinGW GCC > 3.2
# I'm assuming it's fixed for MinGW GCC >= 4.0 when that comes about
CFLAGS += $(shell if [ $(GCC_VERSION) -lt 0400 ] ;\
then echo $(call cc-option,-fno-unit-at-a-time); fi ;)
CFLAGS += $(call cc-option,-fweb,)
CFLAGS += $(call cc-option,-frename-registers,)
CFLAGS += $(call cc-option,-mtune=i686,-mcpu=i686)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
endif
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
# ---------------------------------------------------------
# WIP: Getting rid of recursive make, separate build dirs
# ---------------------------------------------------------
# (sw = software renderer, gl = OpenGL renderer, sv = server)
NQSWDIR = $(BUILD_DIR)/nqsw
NQGLDIR = $(BUILD_DIR)/nqgl
QWSWDIR = $(BUILD_DIR)/qwsw
QWGLDIR = $(BUILD_DIR)/qwgl
QWSVDIR = $(BUILD_DIR)/qwsv
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
BUILD_DIRS = $(NQSWDIR) $(NQGLDIR) $(QWSWDIR) $(QWGLDIR) $(QWSVDIR)
APPS = tyr-quake$(EXT) tyr-glquake$(EXT) \
tyr-qwcl$(EXT) tyr-glqwcl$(EXT) \
tyr-qwsv$(EXT)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
default: all
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
all: prepare $(APPS)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
.PHONY: prepare
prepare: $(BUILD_DIRS)
COMMON_CPPFLAGS := -DTYR_VERSION=$(TYR_VERSION)
ifdef DEBUG
COMMON_CPPFLAGS += -DDEBUG
else
COMMON_CPPFLAGS += -DNDEBUG
endif
[PATCH] Replace id386 define It seems the old trick of undef'ing __i386__ was no longer working under gcc-4.1, so replace the id386 define (controlled by header files) with USE_X86_ASM (controlled by Makefile). The checks for id386 in the assembly files are now gone (if you don't want them, they shouldn't be compiled) and a few extra whitespace cleanups crept in. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:14:02 +09:30
ifndef NO_X86_ASM
COMMON_CPPFLAGS += -DUSE_X86_ASM
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
endif
[PATCH] Make use of COMMON_CPPFLAGS Somehow I didn't end up using the common flags. Move the -I$(TOPDIR)/include flag into there and adjust the program CPPFLAGS to use it. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:14:00 +09:30
COMMON_CPPFLAGS += -I$(TOPDIR)/include
NQSW_CPPFLAGS := $(COMMON_CPPFLAGS) -DNQ_HACK
NQGL_CPPFLAGS := $(COMMON_CPPFLAGS) -DNQ_HACK -DGLQUAKE
QWSW_CPPFLAGS := $(COMMON_CPPFLAGS) -DQW_HACK
QWGL_CPPFLAGS := $(COMMON_CPPFLAGS) -DQW_HACK -DGLQUAKE
QWSV_CPPFLAGS := $(COMMON_CPPFLAGS) -DQW_HACK -DSERVERONLY
NQSW_CPPFLAGS += -I$(TOPDIR)/NQ
NQGL_CPPFLAGS += -I$(TOPDIR)/NQ
QWSW_CPPFLAGS += -I$(TOPDIR)/QW/client
QWGL_CPPFLAGS += -I$(TOPDIR)/QW/client
QWSV_CPPFLAGS += -I$(TOPDIR)/QW/server -I$(TOPDIR)/QW/client
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
ifeq ($(TARGET_OS),WIN32)
NQSW_CPPFLAGS += -idirafter $(DX_INC) -idirafter $(ST_INC)
NQGL_CPPFLAGS += -idirafter $(DX_INC)
QWSW_CPPFLAGS += -idirafter $(DX_INC) -idirafter $(ST_INC)
QWGL_CPPFLAGS += -idirafter $(DX_INC)
endif
ifeq ($(TARGET_OS),LINUX)
NQSW_CPPFLAGS += -DELF -DX11
NQGL_CPPFLAGS += -DELF -DX11
QWSW_CPPFLAGS += -DELF -DX11
QWGL_CPPFLAGS += -DELF -DX11 -DGL_EXT_SHARED
QWSV_CPPFLAGS += -DELF
endif
[PATCH] Target specific CPPFLAGS variable By making the CPPFLAGS variable target specific, we can use the same CC or WINDRES command for each executable. They'll automatically get the right defines and includes from the CPPFLAGS variable. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:57 +09:30
$(BUILD_DIR)/nqsw/%.o: CPPFLAGS = $(NQSW_CPPFLAGS)
$(BUILD_DIR)/nqgl/%.o: CPPFLAGS = $(NQGL_CPPFLAGS)
$(BUILD_DIR)/qwsw/%.o: CPPFLAGS = $(QWSW_CPPFLAGS)
$(BUILD_DIR)/qwgl/%.o: CPPFLAGS = $(QWGL_CPPFLAGS)
$(BUILD_DIR)/qwsv/%.o: CPPFLAGS = $(QWSV_CPPFLAGS)
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
# To make warnings more obvious, be less verbose as default
# Use 'make V=1' to see the full commands
ifdef V
quiet =
else
quiet = quiet_
endif
quiet_cmd_mkdir = ' MKDIR $@'
cmd_mkdir = if [ ! -d $@ ]; then mkdir -p $@; fi
define do_mkdir
@echo $($(quiet)cmd_mkdir);
@$(cmd_mkdir);
endef
[PATCH] Allow for file moves in dependency generation The dependency generation was causing problems whenever I wanted to move a file from the NQ or QW dirs to the shared include dir. This problem has been solved before by others smarter than myself, so I nabbed the solution from http://make.paulandlesley.org/autodep.html. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-16 07:06:01 +09:30
# cmd_fixdep => Turn all pre-requisites into targets with no commands, to
# prevent errors when moving files around between builds (e.g. from NQ or QW
# dirs to the common dir.)
cmd_fixdep = \
cp $(@D)/.$(@F).d $(@D)/.$(@F).d.tmp ; \
sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' -e '/^$$/ d' \
-e 's/$$/ :/' < $(@D)/.$(@F).d.tmp >> $(@D)/.$(@F).d ; \
rm -f $(@D)/.$(@F).d.tmp
cmd_cc_dep_c = \
$(CC) -MM -MT $@ $(CPPFLAGS) -o $(@D)/.$(@F).d $< ; \
$(cmd_fixdep)
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
quiet_cmd_cc_o_c = ' CC $@'
cmd_cc_o_c = $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
define do_cc_o_c
@$(cmd_cc_dep_c);
@echo $($(quiet)cmd_cc_o_c);
@$(cmd_cc_o_c);
endef
[PATCH] Allow for file moves in dependency generation The dependency generation was causing problems whenever I wanted to move a file from the NQ or QW dirs to the shared include dir. This problem has been solved before by others smarter than myself, so I nabbed the solution from http://make.paulandlesley.org/autodep.html. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-16 07:06:01 +09:30
cmd_cc_dep_rc = \
$(CC) -x c-header -MM -MT $@ $(CPPFLAGS) -o $(@D)/.$(@F).d $< ; \
$(cmd_fixdep)
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
quiet_cmd_windres_res_rc = ' WINDRES $@'
cmd_windres_res_rc = windres -I $(<D) -i $< -O coff -o $@
define do_windres_res_rc
@$(cmd_cc_dep_rc);
@echo $($(quiet)cmd_windres_res_rc);
@$(cmd_windres_res_rc);
endef
quiet_cmd_cc_link = ' LINK $@'
cmd_cc_link = $(CC) -o $@ $^ $(1)
define do_cc_link
@echo $($(quiet)cmd_cc_link);
@$(call cmd_cc_link,$(1))
endef
quiet_cmd_strip = ' STRIP $(1)'
cmd_strip = $(STRIP) $(1)
[PATCH] Don't strip when debugging (again) Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
ifndef DEBUG
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
define do_strip
@echo $(call $(quiet)cmd_strip,$(1));
@$(call cmd_strip,$(1));
[PATCH] Add automatic dependency generation This is a first pass at getting automatic file dependencies generated. We use gcc's -M options to have it generate the makefile rules for each object file. The rule for and object file OBJ is stored in the file .OBJ.d. The dependecy file is automatically updated whenever the object file gets updated. I think this can be cleaned up quite a bit (there seems to be a lot of redundancy in there), but it's working right now and I want to get something committed. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:56 +09:30
endef
[PATCH] Don't strip when debugging (again) Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
else
do_strip=
endif
[PATCH] Add automatic dependency generation This is a first pass at getting automatic file dependencies generated. We use gcc's -M options to have it generate the makefile rules for each object file. The rule for and object file OBJ is stored in the file .OBJ.d. The dependecy file is automatically updated whenever the object file gets updated. I think this can be cleaned up quite a bit (there seems to be a lot of redundancy in there), but it's working right now and I want to get something committed. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:56 +09:30
DEPFILES = \
$(wildcard $(BUILD_DIR)/nqsw/.*.d) \
$(wildcard $(BUILD_DIR)/nqgl/.*.d) \
$(wildcard $(BUILD_DIR)/qwsw/.*.d) \
$(wildcard $(BUILD_DIR)/qwgl/.*.d) \
$(wildcard $(BUILD_DIR)/qwsv/.*.d)
ifneq ($(DEPFILES),)
-include $(DEPFILES)
endif
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(NQSWDIR): ; $(do_mkdir)
$(NQGLDIR): ; $(do_mkdir)
$(QWSWDIR): ; $(do_mkdir)
$(QWGLDIR): ; $(do_mkdir)
$(QWSVDIR): ; $(do_mkdir)
$(BUILD_DIR)/nqsw/%.o: common/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/nqsw/%.o: NQ/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/nqsw/%.o: common/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/nqsw/%.o: NQ/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/nqsw/%.res: common/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/nqsw/%.res: NQ/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/nqgl/%.o: common/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/nqgl/%.o: NQ/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/nqgl/%.o: common/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/nqgl/%.o: NQ/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/nqgl/%.res: common/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/nqgl/%.res: NQ/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/qwsw/%.o: common/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/qwsw/%.o: QW/client/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/qwsw/%.o: QW/common/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/qwsw/%.o: common/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/qwsw/%.o: QW/client/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/qwsw/%.o: QW/common/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/qwsw/%.res: common/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/qwsw/%.res: QW/client/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/qwgl/%.o: common/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/qwgl/%.o: QW/client/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/qwgl/%.o: QW/common/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/qwgl/%.o: common/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/qwgl/%.o: QW/client/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/qwgl/%.o: QW/common/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/qwgl/%.res: common/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/qwgl/%.res: QW/client/%.rc ; $(do_windres_res_rc)
$(BUILD_DIR)/qwsv/%.o: QW/server/%.S ; $(do_cc_o_c)
$(BUILD_DIR)/qwsv/%.o: QW/common/%.S ; $(do_cc_o_c)
[PATCH] Fix QW Server build Moving the QW client and NQ model.c files to the common dir broke the server build. We need to prioritise the server directory's files over the common dir to handle this case. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-16 07:05:59 +09:30
$(BUILD_DIR)/qwsv/%.o: common/%.S ; $(do_cc_o_c)
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(BUILD_DIR)/qwsv/%.o: QW/server/%.c ; $(do_cc_o_c)
$(BUILD_DIR)/qwsv/%.o: QW/common/%.c ; $(do_cc_o_c)
[PATCH] Fix QW Server build Moving the QW client and NQ model.c files to the common dir broke the server build. We need to prioritise the server directory's files over the common dir to handle this case. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-16 07:05:59 +09:30
$(BUILD_DIR)/qwsv/%.o: common/%.c ; $(do_cc_o_c)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# ----------------------------------------------------------------------------
# Normal Quake (NQ)
# ----------------------------------------------------------------------------
# Objects common to all versions of NQ, sources are c code
NQ_COMMON_C_OBJS = \
[PATCH] CD audio refactoring Begin some re-factoring of the CD audio code. There's a lot of commonality in there, and I'd like to abstract the OS specific parts of that a little better than it is now. This patch starts things off by moving the CD_f function into a new cd_common.c file which is shared between Linux and MS Windows. Some cleanups of the mciSendCommand calls in cd_win.c got pulled in as well. I prefer the assignment above the if statement. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-16 07:09:55 +09:30
cd_common.o \
Import v0.47 sources
2006-09-10 19:02:51 +09:30
chase.o \
cl_demo.o \
cl_input.o \
cl_main.o \
cl_parse.o \
cl_tent.o \
cmd.o \
common.o \
console.o \
crc.o \
cvar.o \
host.o \
host_cmd.o \
keys.o \
mathlib.o \
menu.o \
net_dgrm.o \
net_loop.o \
net_main.o \
net_vcr.o \
pr_cmds.o \
pr_edict.o \
pr_exec.o \
r_part.o \
\
rb_tree.o \
\
sbar.o \
\
shell.o \
\
snd_dma.o \
snd_mem.o \
snd_mix.o \
sv_main.o \
sv_move.o \
sv_phys.o \
sv_user.o \
view.o \
wad.o \
world.o \
zone.o
NQ_COMMON_ASM_OBJS = \
math.o \
snd_mixa.o \
worlda.o
# Used in both SW and GL versions of NQ on the Win32 platform
NQ_W32_C_OBJS = \
cd_win.o \
conproc.o \
in_win.o \
net_win.o \
net_wins.o \
net_wipx.o \
snd_win.o \
sys_win.o
NQ_W32_ASM_OBJS = \
sys_wina.o
# Used in both SW and GL versions on NQ on the Linux platform
NQ_LINUX_C_OBJS = \
cd_linux.o \
net_udp.o \
net_bsd.o \
snd_linux.o \
sys_linux.o \
x11_core.o \
in_x11.o
NQ_LINUX_ASM_OBJS = \
sys_dosa.o
# Objects only used in software rendering versions of NQ
NQ_SW_C_OBJS = \
d_edge.o \
d_fill.o \
d_init.o \
d_modech.o \
d_part.o \
d_polyse.o \
d_scan.o \
d_sky.o \
d_sprite.o \
d_surf.o \
d_vars.o \
d_zpoint.o \
draw.o \
model.o \
r_aclip.o \
r_alias.o \
r_bsp.o \
r_draw.o \
r_edge.o \
r_efrag.o \
r_light.o \
r_main.o \
r_misc.o \
r_sky.o \
r_sprite.o \
r_surf.o \
r_vars.o \
screen.o
NQ_SW_ASM_OBJS = \
d_draw.o \
d_draw16.o \
d_parta.o \
d_polysa.o \
d_scana.o \
d_spr8.o \
d_varsa.o \
r_aclipa.o \
r_aliasa.o \
r_drawa.o \
r_edgea.o \
r_varsa.o \
surf16.o \
surf8.o
# Objects only used in software rendering versions of NQ on the Win32 Platform
NQ_W32_SW_C_OBJS = \
vid_win.o
NQ_W32_SW_ASM_OBJS = \
dosasm.o
# Objects only used in software rendering versions of NQ on the Linux Platform
NQ_LINUX_SW_C_OBJS = \
vid_x.o
NQ_LINUX_SW_AMS_OBJS =
# Objects only used in OpenGL rendering versions of NQ
NQ_GL_C_OBJS = \
drawhulls.o \
gl_draw.o \
gl_mesh.o \
gl_model.o \
gl_refrag.o \
gl_rlight.o \
gl_rmain.o \
gl_rmisc.o \
gl_rsurf.o \
gl_screen.o \
gl_warp.o
NQ_GL_ASM_OBJS =
# Objects only used in OpenGL rendering versions of NQ on the Win32 Platform
NQ_W32_GL_C_OBJS = \
gl_vidnt.o
NQ_W32_GL_ASM_OBJS =
# Objects only used in OpenGL rendering versions of NQ on the Linux Platform
NQ_LINUX_GL_C_OBJS = \
gl_vidlinuxglx.o
NQ_LINUX_GL_ASM_OBJS =
# Misc objects that don't seem to get used...
NQ_OTHER_ASM_OBJS = \
d_copy.o \
sys_dosa.o
NQ_OTHER_C_OBJS =
# =========================================================================== #
# Build the list of object files for each particular target
# (*sigh* - something has to be done about this makefile...)
NQ_W32_SW_OBJS := $(NQ_COMMON_C_OBJS)
NQ_W32_SW_OBJS += $(NQ_SW_C_OBJS)
NQ_W32_SW_OBJS += $(NQ_W32_C_OBJS)
NQ_W32_SW_OBJS += $(NQ_W32_SW_C_OBJS)
NQ_W32_SW_OBJS += winquake.res
ifdef NO_X86_ASM
NQ_W32_SW_OBJS += nonintel.o
else
NQ_W32_SW_OBJS += $(NQ_COMMON_ASM_OBJS)
NQ_W32_SW_OBJS += $(NQ_SW_ASM_OBJS)
NQ_W32_SW_OBJS += $(NQ_W32_ASM_OBJS)
NQ_W32_SW_OBJS += $(NQ_W32_SW_ASM_OBJS)
endif
NQ_W32_GL_OBJS := $(NQ_COMMON_C_OBJS)
NQ_W32_GL_OBJS += $(NQ_GL_C_OBJS)
NQ_W32_GL_OBJS += $(NQ_W32_C_OBJS)
NQ_W32_GL_OBJS += $(NQ_W32_GL_C_OBJS)
NQ_W32_GL_OBJS += winquake.res
ifndef NO_X86_ASM
NQ_W32_GL_OBJS += $(NQ_COMMON_ASM_OBJS)
NQ_W32_GL_OBJS += $(NQ_GL_ASM_OBJS)
NQ_W32_GL_OBJS += $(NQ_W32_ASM_OBJS)
NQ_W32_GL_OBJS += $(NQ_W32_GL_ASM_OBJS)
endif
NQ_LINUX_SW_OBJS := $(NQ_COMMON_C_OBJS)
NQ_LINUX_SW_OBJS += $(NQ_SW_C_OBJS)
NQ_LINUX_SW_OBJS += $(NQ_LINUX_C_OBJS)
NQ_LINUX_SW_OBJS += $(NQ_LINUX_SW_C_OBJS)
ifdef NO_X86_ASM
NQ_LINUX_SW_OBJS += nonintel.o
else
NQ_LINUX_SW_OBJS += $(NQ_COMMON_ASM_OBJS)
NQ_LINUX_SW_OBJS += $(NQ_SW_ASM_OBJS)
NQ_LINUX_SW_OBJS += $(NQ_LINUX_ASM_OBJS)
NQ_LINUX_SW_OBJS += $(NQ_LINUX_SW_ASM_OBJS)
endif
NQ_LINUX_GL_OBJS := $(NQ_COMMON_C_OBJS)
NQ_LINUX_GL_OBJS += $(NQ_GL_C_OBJS)
NQ_LINUX_GL_OBJS += $(NQ_LINUX_C_OBJS)
NQ_LINUX_GL_OBJS += $(NQ_LINUX_GL_C_OBJS)
ifndef NO_X86_ASM
NQ_LINUX_GL_OBJS += $(NQ_COMMON_ASM_OBJS)
NQ_LINUX_GL_OBJS += $(NQ_GL_ASM_OBJS)
NQ_LINUX_GL_OBJS += $(NQ_LINUX_ASM_OBJS)
NQ_LINUX_GL_OBJS += $(NQ_LINUX_GL_ASM_OBJS)
endif
# ------------------------
# Now, the build rules...
# ------------------------
# Win32
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-quake.exe: $(patsubst %,$(NQSWDIR)/%,$(NQ_W32_SW_OBJS))
[PATCH] Move -mwindows inside the do_cc_link call Doesn't entirely belong in LFLAGS and besides, it shrinks some overly long lines. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:59 +09:30
$(call do_cc_link,-mwindows -L$(NQ_ST_LIBDIR) $(NQ_W32_SW_LFLAGS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-glquake.exe: $(patsubst %,$(NQGLDIR)/%,$(NQ_W32_GL_OBJS))
[PATCH] Move -mwindows inside the do_cc_link call Doesn't entirely belong in LFLAGS and besides, it shrinks some overly long lines. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:59 +09:30
$(call do_cc_link,-mwindows -L$(NQ_ST_LIBDIR) $(NQ_W32_GL_LFLAGS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# Linux
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-quake: $(patsubst %,$(NQSWDIR)/%,$(NQ_LINUX_SW_OBJS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_cc_link,-L$(LINUX_X11_LIBDIR) $(NQ_LINUX_SW_LFLAGS))
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-glquake: $(patsubst %,$(NQGLDIR)/%,$(NQ_LINUX_GL_OBJS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_cc_link,-L$(LINUX_X11_LIBDIR) $(NQ_LINUX_GL_LFLAGS))
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# ----------------------------------------------------------------------------
# QuakeWorld (QW) - Client
# ----------------------------------------------------------------------------
QW_SV_SHARED_C_OBJS = \
cmd.o \
common.o \
crc.o \
cvar.o \
mathlib.o \
md4.o \
net_chan.o \
pmove.o \
pmovetst.o \
rb_tree.o \
shell.o \
zone.o
QW_COMMON_C_OBJS = \
$(QW_SV_SHARED_C_OBJS) \
[PATCH] CD audio refactoring Begin some re-factoring of the CD audio code. There's a lot of commonality in there, and I'd like to abstract the OS specific parts of that a little better than it is now. This patch starts things off by moving the CD_f function into a new cd_common.c file which is shared between Linux and MS Windows. Some cleanups of the mciSendCommand calls in cd_win.c got pulled in as well. I prefer the assignment above the if statement. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-16 07:09:55 +09:30
cd_common.o \
Import v0.47 sources
2006-09-10 19:02:51 +09:30
cl_cam.o \
cl_demo.o \
cl_ents.o \
cl_input.o \
cl_main.o \
cl_parse.o \
cl_pred.o \
cl_tent.o \
console.o \
keys.o \
menu.o \
r_part.o \
sbar.o \
skin.o \
snd_dma.o \
snd_mem.o \
snd_mix.o \
view.o \
wad.o
QW_COMMON_ASM_OBJS = \
math.o \
snd_mixa.o
QW_W32_C_OBJS = \
cd_win.o \
in_win.o \
net_wins.o \
snd_win.o \
sys_win.o
QW_W32_ASM_OBJS = \
sys_wina.o
QW_LINUX_SV_SHARED_C_OBJS = \
net_udp.o
QW_LINUX_C_OBJS = \
$(QW_LINUX_SV_SHARED_C_OBJS) \
cd_linux.o \
snd_linux.o \
sys_linux.o \
in_x11.o \
x11_core.o
QW_LINUX_ASM_OBJS = \
sys_dosa.o
QW_SW_C_OBJS = \
d_edge.o \
d_fill.o \
d_init.o \
d_modech.o \
d_part.o \
d_polyse.o \
d_scan.o \
d_sky.o \
d_sprite.o \
d_surf.o \
d_vars.o \
d_zpoint.o \
draw.o \
model.o \
r_aclip.o \
r_alias.o \
r_bsp.o \
r_draw.o \
r_edge.o \
r_efrag.o \
r_light.o \
r_main.o \
r_misc.o \
r_sky.o \
r_sprite.o \
r_surf.o \
r_vars.o \
screen.o
QW_SW_ASM_OBJS = \
d_draw.o \
d_draw16.o \
d_parta.o \
d_polysa.o \
d_scana.o \
d_spr8.o \
d_varsa.o \
r_aclipa.o \
r_aliasa.o \
r_drawa.o \
r_edgea.o \
r_varsa.o \
surf16.o \
surf8.o
QW_W32_SW_C_OBJS = \
vid_win.o
QW_W32_SW_ASM_OBJS =
QW_LINUX_SW_C_OBJS = \
vid_x.o
QW_LINUX_SW_ASM_OBJS =
QW_GL_C_OBJS = \
drawhulls.o \
gl_draw.o \
gl_mesh.o \
gl_model.o \
gl_ngraph.o \
gl_refrag.o \
gl_rlight.o \
gl_rmain.o \
gl_rmisc.o \
gl_rsurf.o \
gl_screen.o \
gl_warp.o
QW_GL_ASM_OBJS =
QW_W32_GL_C_OBJS = \
gl_vidnt.o
QW_W32_GL_ASM_OBJS =
QW_LINUX_GL_C_OBJS = \
gl_vidlinuxglx.o
QW_LINUX_GL_ASM_OBJS =
# ========================================================================== #
# Build the list of object files for each particular target
# (*sigh* - something has to be done about this makefile...)
QW_W32_SW_OBJS := $(QW_COMMON_C_OBJS)
QW_W32_SW_OBJS += $(QW_SW_C_OBJS)
QW_W32_SW_OBJS += $(QW_W32_C_OBJS)
QW_W32_SW_OBJS += $(QW_W32_SW_C_OBJS)
QW_W32_SW_OBJS += winquake.res
ifdef NO_X86_ASM
QW_W32_SW_OBJS += nonintel.o
else
QW_W32_SW_OBJS += $(QW_COMMON_ASM_OBJS)
QW_W32_SW_OBJS += $(QW_SW_ASM_OBJS)
QW_W32_SW_OBJS += $(QW_W32_ASM_OBJS)
QW_W32_SW_OBJS += $(QW_W32_SW_ASM_OBJS)
endif
QW_W32_GL_OBJS := $(QW_COMMON_C_OBJS)
QW_W32_GL_OBJS += $(QW_GL_C_OBJS)
QW_W32_GL_OBJS += $(QW_W32_C_OBJS)
QW_W32_GL_OBJS += $(QW_W32_GL_C_OBJS)
QW_W32_GL_OBJS += winquake.res
ifndef NO_X86_ASM
QW_W32_GL_OBJS += $(QW_COMMON_ASM_OBJS)
QW_W32_GL_OBJS += $(QW_GL_ASM_OBJS)
QW_W32_GL_OBJS += $(QW_W32_ASM_OBJS)
QW_W32_GL_OBJS += $(QW_W32_GL_ASM_OBJS)
endif
QW_LINUX_SW_OBJS := $(QW_COMMON_C_OBJS)
QW_LINUX_SW_OBJS += $(QW_SW_C_OBJS)
QW_LINUX_SW_OBJS += $(QW_LINUX_C_OBJS)
QW_LINUX_SW_OBJS += $(QW_LINUX_SW_C_OBJS)
ifdef NO_X86_ASM
QW_LINUX_SW_OBJS += nonintel.o
else
QW_LINUX_SW_OBJS += $(QW_COMMON_ASM_OBJS)
QW_LINUX_SW_OBJS += $(QW_SW_ASM_OBJS)
QW_LINUX_SW_OBJS += $(QW_LINUX_ASM_OBJS)
QW_LINUX_SW_OBJS += $(QW_LINUX_SW_ASM_OBJS)
endif
QW_LINUX_GL_OBJS := $(QW_COMMON_C_OBJS)
QW_LINUX_GL_OBJS += $(QW_GL_C_OBJS)
QW_LINUX_GL_OBJS += $(QW_LINUX_C_OBJS)
QW_LINUX_GL_OBJS += $(QW_LINUX_GL_C_OBJS)
ifndef NO_X86_ASM
QW_LINUX_GL_OBJS += $(QW_COMMON_ASM_OBJS)
QW_LINUX_GL_OBJS += $(QW_GL_ASM_OBJS)
QW_LINUX_GL_OBJS += $(QW_LINUX_ASM_OBJS)
QW_LINUX_GL_OBJS += $(QW_LINUX_GL_ASM_OBJS)
endif
# ---------
# QW Libs
# ---------
QW_W32_COMMON_LIBS = wsock32 dxguid winmm
QW_W32_SW_LIBS = mgllt
QW_W32_GL_LIBS = opengl32 comctl32
QW_LINUX_COMMON_LIBS = m X11 Xext Xxf86dga Xxf86vm
QW_LINUX_GL_LIBS = GL
[PATCH] Move -mwindows inside the do_cc_link call Doesn't entirely belong in LFLAGS and besides, it shrinks some overly long lines. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:59 +09:30
QW_W32_SW_LFLAGS = $(patsubst %,-l%,$(QW_W32_SW_LIBS) $(QW_W32_COMMON_LIBS))
QW_W32_GL_LFLAGS = $(patsubst %,-l%,$(QW_W32_GL_LIBS) $(QW_W32_COMMON_LIBS))
Import v0.47 sources
2006-09-10 19:02:51 +09:30
QW_LINUX_SW_LFLAGS = $(patsubst %,-l%,$(QW_LINUX_COMMON_LIBS))
QW_LINUX_GL_LFLAGS = $(patsubst %,-l%,$(QW_LINUX_COMMON_LIBS) $(QW_LINUX_GL_LIBS))
# ---------------------
# build rules
# --------------------
# Win32
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-qwcl.exe: $(patsubst %,$(QWSWDIR)/%,$(QW_W32_SW_OBJS))
[PATCH] Move -mwindows inside the do_cc_link call Doesn't entirely belong in LFLAGS and besides, it shrinks some overly long lines. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:59 +09:30
$(call do_cc_link,-mwindows -L$(QW_ST_LIBDIR) $(QW_W32_SW_LFLAGS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-glqwcl.exe: $(patsubst %,$(QWGLDIR)/%,$(QW_W32_GL_OBJS))
[PATCH] Move -mwindows inside the do_cc_link call Doesn't entirely belong in LFLAGS and besides, it shrinks some overly long lines. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:59 +09:30
$(call do_cc_link,-mwindows $(QW_W32_GL_LFLAGS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# Linux
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-qwcl: $(patsubst %,$(QWSWDIR)/%,$(QW_LINUX_SW_OBJS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_cc_link,-L$(LINUX_X11_LIBDIR) $(QW_LINUX_SW_LFLAGS))
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-glqwcl: $(patsubst %,$(QWGLDIR)/%,$(QW_LINUX_GL_OBJS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_cc_link,-L$(LINUX_X11_LIBDIR) $(QW_LINUX_GL_LFLAGS))
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
UNUSED_OBJS = cd_audio.o
# --------------------------------------------------------------------------
# QuakeWorld (QW) - Server
# --------------------------------------------------------------------------
QWSV_SHARED_OBJS = \
cmd.o \
common.o \
crc.o \
cvar.o \
mathlib.o \
md4.o \
net_chan.o \
pmove.o \
pmovetst.o \
rb_tree.o \
shell.o \
zone.o
QWSV_W32_SHARED_OBJS = \
net_wins.o
QWSV_LINUX_SHARED_OBJS = \
net_udp.o
QWSV_ONLY_OBJS = \
model.o \
pr_cmds.o \
pr_edict.o \
pr_exec.o \
sv_ccmds.o \
sv_ents.o \
sv_init.o \
sv_main.o \
sv_move.o \
sv_nchan.o \
sv_phys.o \
sv_send.o \
sv_user.o \
world.o
QWSV_W32_ONLY_OBJS = \
sys_win.o
QWSV_LINUX_ONLY_OBJS = \
sys_unix.o
QWSV_W32_OBJS = \
$(QWSV_SHARED_OBJS) \
$(QWSV_W32_SHARED_OBJS) \
$(QWSV_ONLY_OBJS) \
$(QWSV_W32_ONLY_OBJS)
QWSV_LINUX_OBJS = \
$(QWSV_SHARED_OBJS) \
$(QWSV_LINUX_SHARED_OBJS) \
$(QWSV_ONLY_OBJS) \
$(QWSV_LINUX_ONLY_OBJS)
# ----------------
# QWSV Libs
# ----------------
QWSV_W32_LIBS = wsock32 winmm
QWSV_W32_LFLAGS = -mconsole $(patsubst %,-l%,$(QWSV_W32_LIBS))
QWSV_LINUX_LIBS = m
QWSV_LINUX_LFLAGS = $(patsubst %,-l%,$(QWSV_LINUX_LIBS))
# -------------
# Build rules
# -------------
# Win32
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-qwsv.exe: $(patsubst %,$(QWSVDIR)/%,$(QWSV_W32_OBJS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_cc_link,$(QWSV_W32_LFLAGS))
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# Linux
[PATCH] Build system update This is a fairly big change to the makefile system. It does two main things: - It removes the need to edit the Makefile to build the different executables. At the moment, it's still necessary to edit the Makefile to change to/from a debug build or to exclude x86 assembly. - It removes the need to make clean every time you want to build another executable. However, the header dependencies are still absent, so you need to be careful when editing headers, as the object files won't get refreshed automatically (yet). All object files now get placed in a 'build' directory, with each application's object files kept in it's own subdirectory. We also no longer do a recursive make invocation in each of the application directories. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:54 +09:30
tyr-qwsv: $(patsubst %,$(QWSVDIR)/%,$(QWSV_LINUX_OBJS))
[PATCH] Non-verbose build by default Taking another leaf out of Kbuild's book, this patch makes the build output less verbose by default. This makes warnings much more obvious when watching the build scroll by. Full command output is still available by running 'make V=1'. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:58 +09:30
$(call do_cc_link,$(QWSV_LINUX_LFLAGS))
$(call do_strip,$@)
Import v0.47 sources
2006-09-10 19:02:51 +09:30
# ----------------------------------------------------------------------------
# Very basic clean target (can't use xargs on MSYS)
# ----------------------------------------------------------------------------
# Main clean function...
clean:
[PATCH] remove build dir before other cleaning It makes sense to remove the build dir before we execute the find command, so we don't duplicate the work. Signed-off-by: Tyrann <tyrann@disenchant.net>
2006-09-10 19:13:55 +09:30
@rm -rf build
Import v0.47 sources
2006-09-10 19:02:51 +09:30
@rm -f $(shell find . \( \
-name '*~' -o -name '#*#' -o -name '*.o' -o -name '*.res' \
\) -print)
Reference in New Issue Copy Permalink