diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 281 |
1 files changed, 125 insertions, 156 deletions
@@ -27,6 +27,10 @@ BUILD_SERVER = BUILD_GAME_SO = BUILD_GAME_QVM = +ifneq ($(PLATFORM),darwin) + BUILD_CLIENT_SMP = 0 +endif + ############################################################################# # # If you require a different configuration from the defaults below, create a @@ -83,10 +87,6 @@ USE_CCACHE=0 endif export USE_CCACHE -ifndef USE_SDL -USE_SDL=1 -endif - ifndef USE_OPENAL USE_OPENAL=1 endif @@ -127,8 +127,9 @@ CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer CMDIR=$(MOUNT_DIR)/qcommon -UDIR=$(MOUNT_DIR)/unix -W32DIR=$(MOUNT_DIR)/win32 +SDLDIR=$(MOUNT_DIR)/sdl +ASMDIR=$(MOUNT_DIR)/asm +SYSDIR=$(MOUNT_DIR)/sys GDIR=$(MOUNT_DIR)/game CGDIR=$(MOUNT_DIR)/cgame NDIR=$(MOUNT_DIR)/null @@ -147,7 +148,7 @@ USE_SVN= ifeq ($(wildcard .svn),.svn) SVN_REV=$(shell LANG=C svnversion .) ifneq ($(SVN_REV),) - SVN_VERSION=$(VERSION)_SVN$(SVN_REV) + SVN_VERSION=$(SVN_REV) USE_SVN=1 endif endif @@ -184,7 +185,8 @@ ifeq ($(PLATFORM),linux) endif endif - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -pipe -DUSE_ICON $(shell sdl-config --cflags) ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL=1 @@ -204,12 +206,6 @@ ifeq ($(PLATFORM),linux) BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 endif - ifeq ($(USE_SDL),1) - BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags) - else - BASE_CFLAGS += -I/usr/X11R6/include - endif - OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer ifeq ($(ARCH),x86_64) @@ -236,10 +232,6 @@ ifeq ($(PLATFORM),linux) BASE_CFLAGS += -DNO_VM_COMPILED endif - DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 - - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) - SHLIBEXT=so SHLIBCFLAGS=-fPIC SHLIBLDFLAGS=-shared $(LDFLAGS) @@ -247,18 +239,14 @@ ifeq ($(PLATFORM),linux) THREAD_LDFLAGS=-lpthread LDFLAGS=-ldl -lm - ifeq ($(USE_SDL),1) - CLIENT_LDFLAGS=$(shell sdl-config --libs) - else - CLIENT_LDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm - endif + CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) CLIENT_LDFLAGS += -lopenal endif endif - + ifeq ($(USE_CURL),1) ifneq ($(USE_CURL_DLOPEN),1) CLIENT_LDFLAGS += -lcurl @@ -275,6 +263,9 @@ ifeq ($(PLATFORM),linux) LDFLAGS+=-m32 endif + DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) + else # ifeq Linux ############################################################################# @@ -373,19 +364,13 @@ ifeq ($(PLATFORM),darwin) CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif - ifeq ($(USE_SDL),1) - BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 -D_THREAD_SAFE=1 \ - -I$(SDLHDIR)/include - # We copy sdlmain before ranlib'ing it so that subversion doesn't think - # the file has been modified by each build. - LIBSDLMAIN=$(B)/libSDLmain.a - LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a - CLIENT_LDFLAGS += -framework Cocoa -framework IOKit -framework OpenGL \ - $(LIBSDIR)/macosx/libSDL-1.2.0.dylib - else - # !!! FIXME: frameworks: OpenGL, Carbon, etc... - #CLIENT_LDFLAGS += -L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm - endif + BASE_CFLAGS += -D_THREAD_SAFE=1 -I$(SDLHDIR)/include + # We copy sdlmain before ranlib'ing it so that subversion doesn't think + # the file has been modified by each build. + LIBSDLMAIN=$(B)/libSDLmain.a + LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a + CLIENT_LDFLAGS += -framework Cocoa -framework IOKit -framework OpenGL \ + $(LIBSDIR)/macosx/libSDL-1.2.0.dylib OPTIMIZE += -ffast-math -falign-loops=16 @@ -418,7 +403,8 @@ endif ARCH=x86 - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -DUSE_ICON -I$(SDLHDIR)/include ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL=1 -DUSE_OPENAL_DLOPEN=1 @@ -435,22 +421,19 @@ endif BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 endif - OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math -falign-loops=2 \ - -funroll-loops -falign-jumps=2 -falign-functions=2 -fstrength-reduce + OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \ + -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ + -fstrength-reduce HAVE_VM_COMPILED = true - DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 - - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) - SHLIBEXT=dll SHLIBCFLAGS= SHLIBLDFLAGS=-shared $(LDFLAGS) BINEXT=.exe - LDFLAGS= -mwindows -lwsock32 -lgdi32 -lwinmm -lole32 + LDFLAGS= -mwindows -lwsock32 -lgdi32 -lwinmm -lole32 -lopengl32 CLIENT_LDFLAGS= ifeq ($(USE_CURL),1) @@ -469,6 +452,14 @@ endif LDFLAGS+=-m32 endif + DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) + + # libmingw32 must be linked before libSDLmain + CLIENT_LDFLAGS += -lmingw32 \ + $(LIBSDIR)/win32/libSDLmain.a \ + $(LIBSDIR)/win32/libSDL.dll.a + BUILD_SERVER = 0 BUILD_CLIENT_SMP = 0 @@ -488,9 +479,7 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -I/usr/X11R6/include - - DEBUG_CFLAGS=$(BASE_CFLAGS) -g + -DUSE_ICON $(shell sdl-config --cflags) ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL=1 @@ -503,10 +492,6 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 endif - ifeq ($(USE_SDL),1) - BASE_CFLAGS += $(shell sdl11-config --cflags) -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 - endif - ifeq ($(ARCH),axp) BASE_CFLAGS += -DNO_VM_COMPILED RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ @@ -523,6 +508,8 @@ ifeq ($(PLATFORM),freebsd) endif endif + DEBUG_CFLAGS=$(BASE_CFLAGS) -g + SHLIBEXT=so SHLIBCFLAGS=-fPIC SHLIBLDFLAGS=-shared $(LDFLAGS) @@ -533,11 +520,7 @@ ifeq ($(PLATFORM),freebsd) CLIENT_LDFLAGS = - ifeq ($(USE_SDL),1) - CLIENT_LDFLAGS += $(shell sdl11-config --libs) - else - CLIENT_LDFLAGS += -L/usr/X11R6/$(LIB) -lGL -lX11 -lXext -lXxf86dga -lXxf86vm - endif + CLIENT_LDFLAGS += $(shell sdl-config --libs) -lGL ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) @@ -569,12 +552,13 @@ ifeq ($(PLATFORM),netbsd) THREAD_LDFLAGS=-lpthread BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - DEBUG_CFLAGS=$(BASE_CFLAGS) -g ifneq ($(ARCH),x86) BASE_CFLAGS += -DNO_VM_COMPILED endif + DEBUG_CFLAGS=$(BASE_CFLAGS) -g + BUILD_CLIENT = 0 BUILD_GAME_QVM = 0 @@ -626,13 +610,8 @@ ifeq ($(PLATFORM),sunos) endif - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe - - ifeq ($(USE_SDL),1) - BASE_CFLAGS += -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags) - else - BASE_CFLAGS += -I/usr/openwin/include - endif + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -pipe -DUSE_ICON $(shell sdl-config --cflags) OPTIMIZE = -O3 -ffast-math -funroll-loops @@ -670,11 +649,7 @@ ifeq ($(PLATFORM),sunos) BOTCFLAGS=-O0 - ifeq ($(USE_SDL),1) - CLIENT_LDFLAGS=$(shell sdl-config --libs) -L/usr/X11/lib -lGLU -lX11 -lXext - else - CLIENT_LDFLAGS=-L/usr/openwin/$(LIB) -L/usr/X11/lib -lGLU -lX11 -lXext - endif + CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL else # ifeq sunos @@ -746,19 +721,27 @@ ifeq ($(USE_SVN),1) BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\" endif +ifeq ($(V),1) +echo_cmd=@: +Q= +else +echo_cmd=@echo +Q=@ +endif + define DO_CC -@echo "CC $<" -@$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $< +$(echo_cmd) "CC $<" +$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $< endef define DO_SMP_CC -@echo "SMP_CC $<" -@$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $< +$(echo_cmd) "SMP_CC $<" +$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $< endef define DO_BOT_CC -@echo "BOT_CC $<" -@$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) -DBOTLIB -o $@ -c $< +$(echo_cmd) "BOT_CC $<" +$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) -DBOTLIB -o $@ -c $< endef ifeq ($(GENERATE_DEPENDENCIES),1) @@ -766,24 +749,24 @@ ifeq ($(GENERATE_DEPENDENCIES),1) endif define DO_SHLIB_CC -@echo "SHLIB_CC $<" -@$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< -@$(DO_QVM_DEP) +$(echo_cmd) "SHLIB_CC $<" +$(Q)$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< +$(Q)$(DO_QVM_DEP) endef define DO_AS -@echo "AS $<" -@$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< +$(echo_cmd) "AS $<" +$(Q)$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< endef define DO_DED_CC -@echo "DED_CC $<" -@$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) -o $@ -c $< +$(echo_cmd) "DED_CC $<" +$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) -o $@ -c $< endef define DO_WINDRES -@echo "WINDRES $<" -@$(WINDRES) -i $< -o $@ +$(echo_cmd) "WINDRES $<" +$(Q)$(WINDRES) -i $< -o $@ endef @@ -795,13 +778,13 @@ default: release all: debug release debug: - @$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS)" + @$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS)" V=$(V) ifeq ($(BUILD_MASTER_SERVER),1) $(MAKE) -C $(MASTERDIR) debug endif release: - @$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS)" + @$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS)" V=$(V) ifeq ($(BUILD_MASTER_SERVER),1) $(MAKE) -C $(MASTERDIR) release endif @@ -811,6 +794,10 @@ endif targets: makedirs tools @echo "" @echo "Building Tremulous in $(B):" + @echo " PLATFORM: $(PLATFORM)" + @echo " ARCH: $(ARCH)" + @echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)" + @echo " COMPILE_ARCH: $(COMPILE_ARCH)" @echo " CC: $(CC)" @echo "" @echo " CFLAGS:" @@ -825,7 +812,7 @@ targets: makedirs tools echo " $$i"; \ done @echo "" - @$(MAKE) $(TARGETS) + @$(MAKE) $(TARGETS) V=$(V) makedirs: @if [ ! -d $(BUILD_DIR) ];then $(MKDIR) $(BUILD_DIR);fi @@ -857,10 +844,11 @@ tools: endif define DO_Q3LCC -@echo "Q3LCC $<" -@$(Q3LCC) -o $@ $< +$(echo_cmd) "Q3LCC $<" +$(Q)$(Q3LCC) -o $@ $< endef + ############################################################################# # CLIENT/SERVER ############################################################################# @@ -892,6 +880,7 @@ Q3OBJ = \ $(B)/client/md5.o \ $(B)/client/msg.o \ $(B)/client/net_chan.o \ + $(B)/client/net_ip.o \ $(B)/client/huffman.o \ $(B)/client/parse.o \ \ @@ -986,6 +975,12 @@ Q3OBJ = \ $(B)/client/tr_sky.o \ $(B)/client/tr_surface.o \ $(B)/client/tr_world.o \ + \ + $(B)/client/sdl_gamma.o \ + $(B)/client/sdl_input.o \ + $(B)/client/sdl_snd.o \ + \ + $(B)/client/sys_main.o ifeq ($(ARCH),x86) Q3OBJ += \ @@ -1009,54 +1004,27 @@ endif ifeq ($(PLATFORM),mingw32) Q3OBJ += \ - $(B)/client/win_gamma.o \ - $(B)/client/win_glimp.o \ - $(B)/client/win_input.o \ - $(B)/client/win_main.o \ - $(B)/client/win_net.o \ - $(B)/client/win_qgl.o \ - $(B)/client/win_shared.o \ - $(B)/client/win_snd.o \ - $(B)/client/win_syscon.o \ - $(B)/client/win_wndproc.o \ - $(B)/client/win_resource.o + $(B)/client/win_resource.o \ + $(B)/client/sys_win32.o else Q3OBJ += \ - $(B)/client/unix_main.o \ - $(B)/client/unix_net.o \ - $(B)/client/unix_shared.o \ - $(B)/client/linux_signals.o \ - $(B)/client/linux_qgl.o \ - $(B)/client/linux_snd.o \ - $(B)/client/sdl_snd.o - - ifeq ($(PLATFORM),linux) - Q3OBJ += $(B)/client/linux_joystick.o - endif - - ifeq ($(USE_SDL),1) - ifneq ($(PLATFORM),darwin) - BUILD_CLIENT_SMP = 0 - endif - endif + $(B)/client/sys_unix.o +endif - Q3POBJ = \ - $(B)/client/linux_glimp.o \ - $(B)/client/sdl_glimp.o +Q3POBJ += \ + $(B)/client/sdl_glimp.o - Q3POBJ_SMP = \ - $(B)/clientsmp/linux_glimp.o \ - $(B)/clientsmp/sdl_glimp.o -endif +Q3POBJ_SMP += \ + $(B)/clientsmp/sdl_glimp.o $(B)/tremulous.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) - @echo "LD $@" - @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ + $(echo_cmd) "LD $@" + $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ $(LDFLAGS) $(LIBSDLMAIN) $(B)/tremulous-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - @echo "LD $@" - @$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ + $(echo_cmd) "LD $@" + $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) ifneq ($(strip $(LIBSDLMAIN)),) @@ -1095,6 +1063,7 @@ Q3DOBJ = \ $(B)/ded/md4.o \ $(B)/ded/msg.o \ $(B)/ded/net_chan.o \ + $(B)/ded/net_ip.o \ $(B)/ded/huffman.o \ $(B)/ded/parse.o \ \ @@ -1105,14 +1074,14 @@ Q3DOBJ = \ $(B)/ded/vm.o \ $(B)/ded/vm_interpreted.o \ \ - $(B)/ded/linux_signals.o \ - $(B)/ded/unix_main.o \ - $(B)/ded/unix_net.o \ - $(B)/ded/unix_shared.o \ - \ $(B)/ded/null_client.o \ $(B)/ded/null_input.o \ - $(B)/ded/null_snddma.o + $(B)/ded/null_snddma.o \ + \ + $(B)/ded/tty_console.o \ + $(B)/ded/sys_unix.o \ + \ + $(B)/ded/sys_main.o ifeq ($(ARCH),x86) Q3DOBJ += \ @@ -1134,8 +1103,8 @@ ifeq ($(HAVE_VM_COMPILED),true) endif $(B)/tremded.$(ARCH)$(BINEXT): $(Q3DOBJ) - @echo "LD $@" - @$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) + $(echo_cmd) "LD $@" + $(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) @@ -1180,12 +1149,12 @@ CGOBJ = $(CGOBJ_) $(B)/base/cgame/cg_syscalls.o CGVMOBJ = $(CGOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm $(B)/base/cgame$(ARCH).$(SHLIBEXT) : $(CGOBJ) - @echo "LD $@" - @$(CC) $(SHLIBLDFLAGS) -o $@ $(CGOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(CGOBJ) $(B)/base/vm/cgame.qvm: $(CGVMOBJ) $(CGDIR)/cg_syscalls.asm - @echo "Q3ASM $@" - @$(Q3ASM) -o $@ $(CGVMOBJ) $(CGDIR)/cg_syscalls.asm + $(echo_cmd) "Q3ASM $@" + $(Q)$(Q3ASM) -o $@ $(CGVMOBJ) $(CGDIR)/cg_syscalls.asm @@ -1227,12 +1196,12 @@ GOBJ = $(GOBJ_) $(B)/base/game/g_syscalls.o GVMOBJ = $(GOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm $(B)/base/game$(ARCH).$(SHLIBEXT) : $(GOBJ) - @echo "LD $@" - @$(CC) $(SHLIBLDFLAGS) -o $@ $(GOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(GOBJ) $(B)/base/vm/game.qvm: $(GVMOBJ) $(GDIR)/g_syscalls.asm - @echo "Q3ASM $@" - @$(Q3ASM) -o $@ $(GVMOBJ) $(GDIR)/g_syscalls.asm + $(echo_cmd) "Q3ASM $@" + $(Q)$(Q3ASM) -o $@ $(GVMOBJ) $(GDIR)/g_syscalls.asm @@ -1255,12 +1224,12 @@ UIOBJ = $(UIOBJ_) $(B)/base/ui/ui_syscalls.o UIVMOBJ = $(UIOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm $(B)/base/ui$(ARCH).$(SHLIBEXT) : $(UIOBJ) - @echo "LD $@" - @$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(UIOBJ) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(UIOBJ) $(B)/base/vm/ui.qvm: $(UIVMOBJ) $(UIDIR)/ui_syscalls.asm - @echo "Q3ASM $@" - @$(Q3ASM) -o $@ $(UIVMOBJ) $(UIDIR)/ui_syscalls.asm + $(echo_cmd) "Q3ASM $@" + $(Q)$(Q3ASM) -o $@ $(UIVMOBJ) $(UIDIR)/ui_syscalls.asm @@ -1268,7 +1237,7 @@ $(B)/base/vm/ui.qvm: $(UIVMOBJ) $(UIDIR)/ui_syscalls.asm ## CLIENT/SERVER RULES ############################################################################# -$(B)/client/%.o: $(UDIR)/%.s +$(B)/client/%.o: $(ASMDIR)/%.s $(DO_AS) $(B)/client/%.o: $(CDIR)/%.c @@ -1289,20 +1258,20 @@ $(B)/client/%.o: $(JPDIR)/%.c $(B)/client/%.o: $(RDIR)/%.c $(DO_CC) -$(B)/client/%.o: $(UDIR)/%.c +$(B)/client/%.o: $(SDLDIR)/%.c $(DO_CC) -$(B)/clientsmp/%.o: $(UDIR)/%.c +$(B)/clientsmp/%.o: $(SDLDIR)/%.c $(DO_SMP_CC) -$(B)/client/%.o: $(W32DIR)/%.c +$(B)/client/%.o: $(SYSDIR)/%.c $(DO_CC) -$(B)/client/%.o: $(W32DIR)/%.rc +$(B)/client/%.o: $(SYSDIR)/%.rc $(DO_WINDRES) -$(B)/ded/%.o: $(UDIR)/%.s +$(B)/ded/%.o: $(ASMDIR)/%.s $(DO_AS) $(B)/ded/%.o: $(SDIR)/%.c @@ -1314,7 +1283,7 @@ $(B)/ded/%.o: $(CMDIR)/%.c $(B)/ded/%.o: $(BLIBDIR)/%.c $(DO_BOT_CC) -$(B)/ded/%.o: $(UDIR)/%.c +$(B)/ded/%.o: $(SYSDIR)/%.c $(DO_DED_CC) $(B)/ded/%.o: $(NDIR)/%.c |