From 074e36b8a4be6fd8193eb773fe6625277cf5dedd Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Wed, 12 Dec 2012 20:56:23 +0000 Subject: [PATCH] Makefile adjustments --- reaction/Makefile | 232 ++++++++++++++++++++++++++-------------- reaction/Makefile.local | 3 +- 2 files changed, 152 insertions(+), 83 deletions(-) diff --git a/reaction/Makefile b/reaction/Makefile index a0e5fed1..f3ddb82f 100644 --- a/reaction/Makefile +++ b/reaction/Makefile @@ -50,8 +50,8 @@ endif ifndef BUILD_MISSIONPACK BUILD_MISSIONPACK= endif -ifndef BUILD_RENDERER_GL2 - BUILD_RENDERER_GL2= 1 +ifndef BUILD_RENDERER_REND2 + BUILD_RENDERER_REND2= endif ifneq ($(PLATFORM),darwin) @@ -219,7 +219,7 @@ BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH) CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer -R2DIR=$(MOUNT_DIR)/renderergl2 +R2DIR=$(MOUNT_DIR)/rend2 CMDIR=$(MOUNT_DIR)/qcommon SDLDIR=$(MOUNT_DIR)/sdl ASMDIR=$(MOUNT_DIR)/asm @@ -410,7 +410,7 @@ ifeq ($(PLATFORM),darwin) RENDERER_LIBS= OPTIMIZEVM= - BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes + BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -DREACTION ifeq ($(ARCH),ppc) BASE_CFLAGS += -arch ppc -faltivec -mmacosx-version-min=10.2 @@ -606,7 +606,7 @@ ifeq ($(PLATFORM),freebsd) # flags BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \ -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON + -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON -DREACTION CLIENT_CFLAGS += $(SDL_CFLAGS) HAVE_VM_COMPILED = true @@ -666,7 +666,7 @@ ifeq ($(PLATFORM),openbsd) ARCH=$(shell uname -m) BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON + -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON -DREACTION CLIENT_CFLAGS += $(SDL_CFLAGS) ifeq ($(USE_CURL),1) @@ -721,7 +721,7 @@ ifeq ($(PLATFORM),netbsd) SHLIBLDFLAGS=-shared $(LDFLAGS) THREAD_LIBS=-lpthread - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -DREACTION ifeq ($(ARCH),i386) HAVE_VM_COMPILED=true @@ -743,7 +743,7 @@ ifeq ($(PLATFORM),irix64) MKDIR = mkdir -p BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 \ - -I. -I$(ROOT)/usr/include + -I. -I$(ROOT)/usr/include -DREACTION CLIENT_CFLAGS += $(SDL_CFLAGS) OPTIMIZE = -O3 @@ -783,7 +783,7 @@ ifeq ($(PLATFORM),sunos) endif BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -pipe -DUSE_ICON + -pipe -DUSE_ICON -DREACTION CLIENT_CFLAGS += $(SDL_CFLAGS) OPTIMIZEVM = -O3 -funroll-loops @@ -869,16 +869,22 @@ ifneq ($(BUILD_CLIENT),0) ifneq ($(BUILD_CLIENT_SMP),0) TARGETS += $(B)/renderer_opengl1_smp_$(SHLIBNAME) endif - ifneq ($(BUILD_RENDERER_GL2), 0) - TARGETS += $(B)/renderer_opengl2_$(SHLIBNAME) + ifneq ($(BUILD_RENDERER_REND2), 0) + TARGETS += $(B)/renderer_rend2_$(SHLIBNAME) ifneq ($(BUILD_CLIENT_SMP),0) - TARGETS += $(B)/renderer_opengl2_smp_$(SHLIBNAME) + TARGETS += $(B)/renderer_rend2_smp_$(SHLIBNAME) endif endif else TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT) + ifneq ($(BUILD_RENDERER_REND2), 0) + TARGETS += $(B)/$(CLIENTBIN)_rend2$(FULLBINEXT) + endif ifneq ($(BUILD_CLIENT_SMP),0) TARGETS += $(B)/$(CLIENTBIN)-smp$(FULLBINEXT) + ifneq ($(BUILD_RENDERER_REND2), 0) + TARGETS += $(B)/$(CLIENTBIN)_rend2-smp$(FULLBINEXT) + endif endif endif endif @@ -1021,6 +1027,14 @@ $(echo_cmd) "REF_CC $<" $(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< endef +define DO_REF_STR +$(echo_cmd) "REF_STR $<" +$(Q)rm -f $@ +$(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@ +$(Q)cat $< | sed 's/\\/\\\\/;s/\t/\\t/;s/\"/\\"/;s/$$/\\n"/;s/^/"/' >> $@ +$(Q)echo ";" >> $@ +endef + define DO_SMP_CC $(echo_cmd) "SMP_CC $<" $(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -DSMP -o $@ -c $< @@ -1183,7 +1197,8 @@ makedirs: @if [ ! -d $(B) ];then $(MKDIR) $(B);fi @if [ ! -d $(B)/client ];then $(MKDIR) $(B)/client;fi @if [ ! -d $(B)/renderer ];then $(MKDIR) $(B)/renderer;fi - @if [ ! -d $(B)/renderergl2 ];then $(MKDIR) $(B)/renderergl2;fi + @if [ ! -d $(B)/rend2 ];then $(MKDIR) $(B)/rend2;fi + @if [ ! -d $(B)/rend2/glsl ];then $(MKDIR) $(B)/rend2/glsl;fi @if [ ! -d $(B)/renderersmp ];then $(MKDIR) $(B)/renderersmp;fi @if [ ! -d $(B)/ded ];then $(MKDIR) $(B)/ded;fi @if [ ! -d $(B)/$(BASEGAME) ];then $(MKDIR) $(B)/$(BASEGAME);fi @@ -1490,44 +1505,73 @@ else endif Q3R2OBJ = \ - $(B)/renderergl2/tr_animation.o \ - $(B)/renderergl2/tr_backend.o \ - $(B)/renderergl2/tr_bsp.o \ - $(B)/renderergl2/tr_cmds.o \ - $(B)/renderergl2/tr_curve.o \ - $(B)/renderergl2/tr_extramath.o \ - $(B)/renderergl2/tr_extensions.o \ - $(B)/renderergl2/tr_fbo.o \ - $(B)/renderergl2/tr_flares.o \ - $(B)/renderergl2/tr_font.o \ - $(B)/renderergl2/tr_glsl.o \ - $(B)/renderergl2/tr_image.o \ - $(B)/renderer/tr_image_png.o \ - $(B)/renderer/tr_image_jpg.o \ - $(B)/renderer/tr_image_bmp.o \ - $(B)/renderer/tr_image_tga.o \ - $(B)/renderer/tr_image_pcx.o \ - $(B)/renderergl2/tr_init.o \ - $(B)/renderergl2/tr_light.o \ - $(B)/renderergl2/tr_main.o \ - $(B)/renderergl2/tr_marks.o \ - $(B)/renderergl2/tr_mesh.o \ - $(B)/renderergl2/tr_model.o \ - $(B)/renderergl2/tr_model_iqm.o \ - $(B)/renderer/tr_noise.o \ - $(B)/renderergl2/tr_postprocess.o \ - $(B)/renderergl2/tr_scene.o \ - $(B)/renderergl2/tr_shade.o \ - $(B)/renderergl2/tr_shade_calc.o \ - $(B)/renderergl2/tr_shader.o \ - $(B)/renderergl2/tr_shadows.o \ - $(B)/renderergl2/tr_sky.o \ - $(B)/renderergl2/tr_surface.o \ - $(B)/renderergl2/tr_vbo.o \ - $(B)/renderergl2/tr_world.o \ + $(B)/rend2/tr_animation.o \ + $(B)/rend2/tr_backend.o \ + $(B)/rend2/tr_bsp.o \ + $(B)/rend2/tr_cmds.o \ + $(B)/rend2/tr_curve.o \ + $(B)/rend2/tr_extramath.o \ + $(B)/rend2/tr_extensions.o \ + $(B)/rend2/tr_fbo.o \ + $(B)/rend2/tr_flares.o \ + $(B)/rend2/tr_font.o \ + $(B)/rend2/tr_glsl.o \ + $(B)/rend2/tr_image.o \ + $(B)/rend2/tr_image_png.o \ + $(B)/rend2/tr_image_jpg.o \ + $(B)/rend2/tr_image_bmp.o \ + $(B)/rend2/tr_image_tga.o \ + $(B)/rend2/tr_image_pcx.o \ + $(B)/rend2/tr_init.o \ + $(B)/rend2/tr_light.o \ + $(B)/rend2/tr_main.o \ + $(B)/rend2/tr_marks.o \ + $(B)/rend2/tr_mesh.o \ + $(B)/rend2/tr_model.o \ + $(B)/rend2/tr_model_iqm.o \ + $(B)/rend2/tr_noise.o \ + $(B)/rend2/tr_postprocess.o \ + $(B)/rend2/tr_scene.o \ + $(B)/rend2/tr_shade.o \ + $(B)/rend2/tr_shade_calc.o \ + $(B)/rend2/tr_shader.o \ + $(B)/rend2/tr_shadows.o \ + $(B)/rend2/tr_sky.o \ + $(B)/rend2/tr_surface.o \ + $(B)/rend2/tr_vbo.o \ + $(B)/rend2/tr_world.o \ \ - $(B)/renderer/sdl_gamma.o \ - $(B)/renderer/sdl_glimp.o + $(B)/renderer/sdl_gamma.o + +Q3R2STRINGOBJ = \ + $(B)/rend2/glsl/bokeh_fp.o \ + $(B)/rend2/glsl/bokeh_vp.o \ + $(B)/rend2/glsl/calclevels4x_fp.o \ + $(B)/rend2/glsl/calclevels4x_vp.o \ + $(B)/rend2/glsl/depthblur_fp.o \ + $(B)/rend2/glsl/depthblur_vp.o \ + $(B)/rend2/glsl/dlight_fp.o \ + $(B)/rend2/glsl/dlight_vp.o \ + $(B)/rend2/glsl/down4x_fp.o \ + $(B)/rend2/glsl/down4x_vp.o \ + $(B)/rend2/glsl/fogpass_fp.o \ + $(B)/rend2/glsl/fogpass_vp.o \ + $(B)/rend2/glsl/generic_fp.o \ + $(B)/rend2/glsl/generic_vp.o \ + $(B)/rend2/glsl/lightall_fp.o \ + $(B)/rend2/glsl/lightall_vp.o \ + $(B)/rend2/glsl/pshadow_fp.o \ + $(B)/rend2/glsl/pshadow_vp.o \ + $(B)/rend2/glsl/shadowfill_fp.o \ + $(B)/rend2/glsl/shadowfill_vp.o \ + $(B)/rend2/glsl/shadowmask_fp.o \ + $(B)/rend2/glsl/shadowmask_vp.o \ + $(B)/rend2/glsl/ssao_fp.o \ + $(B)/rend2/glsl/ssao_vp.o \ + $(B)/rend2/glsl/texturecolor_fp.o \ + $(B)/rend2/glsl/texturecolor_vp.o \ + $(B)/rend2/glsl/tonemap_fp.o \ + $(B)/rend2/glsl/tonemap_vp.o Q3ROBJ = \ $(B)/renderer/tr_animation.o \ @@ -1560,9 +1604,14 @@ Q3ROBJ = \ $(B)/renderer/tr_surface.o \ $(B)/renderer/tr_world.o \ \ - $(B)/renderer/sdl_gamma.o \ + $(B)/renderer/sdl_gamma.o + +Q3RPOBJ_UP = \ $(B)/renderer/sdl_glimp.o +Q3RPOBJ_SMP = \ + $(B)/renderersmp/sdl_glimp.o + ifneq ($(USE_RENDERER_DLOPEN), 0) Q3ROBJ += \ $(B)/renderer/q_shared.o \ @@ -1789,37 +1838,49 @@ $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN) -o $@ $(Q3OBJ) \ $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) -$(B)/renderer_opengl1_$(SHLIBNAME): $(Q3ROBJ) $(JPGOBJ) +$(B)/renderer_opengl1_$(SHLIBNAME): $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ) $(echo_cmd) "LD $@" - $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(JPGOBJ) \ + $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) -$(B)/renderer_opengl1_smp_$(SHLIBNAME): $(Q3ROBJ) $(JPGOBJ) +$(B)/renderer_opengl1_smp_$(SHLIBNAME): $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) $(echo_cmd) "LD $@" - $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(JPGOBJ) \ + $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) -$(B)/renderer_opengl2_$(SHLIBNAME): $(Q3R2OBJ) $(JPGOBJ) +$(B)/renderer_rend2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ) $(echo_cmd) "LD $@" - $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(JPGOBJ) \ + $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) -$(B)/renderer_opengl2_smp_$(SHLIBNAME): $(Q3R2OBJ) $(JPGOBJ) +$(B)/renderer_rend2_smp_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) $(echo_cmd) "LD $@" - $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(JPGOBJ) \ + $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) else -$(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(LIBSDLMAIN) +$(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ) $(LIBSDLMAIN) $(echo_cmd) "LD $@" $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \ - -o $@ $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) \ + -o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \ $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) -$(B)/$(CLIENTBIN)-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(LIBSDLMAIN) +$(B)/$(CLIENTBIN)-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) $(LIBSDLMAIN) $(echo_cmd) "LD $@" $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ - -o $@ $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) \ + -o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \ + $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) + +$(B)/$(CLIENTBIN)_rend2$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ) $(LIBSDLMAIN) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \ + -o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_UP) $(JPGOBJ) \ + $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) + +$(B)/$(CLIENTBIN)_rend2-smp$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) $(LIBSDLMAIN) + $(echo_cmd) "LD $@" + $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ + -o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(Q3RPOBJ_SMP) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) endif @@ -2044,7 +2105,6 @@ Q3CGOBJ_ = \ $(B)/$(BASEGAME)/cgame/cg_snapshot.o \ $(B)/$(BASEGAME)/cgame/cg_view.o \ $(B)/$(BASEGAME)/cgame/cg_weapons.o \ - \ $(B)/$(BASEGAME)/cgame/cg_unlagged.o \ $(B)/$(BASEGAME)/cgame/cg_atmospheric.o \ \ @@ -2145,7 +2205,6 @@ Q3GOBJ_ = \ $(B)/$(BASEGAME)/game/g_trigger.o \ $(B)/$(BASEGAME)/game/g_utils.o \ $(B)/$(BASEGAME)/game/g_weapon.o \ - \ $(B)/$(BASEGAME)/game/g_matchmode.o \ $(B)/$(BASEGAME)/game/g_parser.o \ $(B)/$(BASEGAME)/game/g_scripts.o \ @@ -2239,7 +2298,7 @@ Q3UIOBJ_ = \ $(B)/$(BASEGAME)/qcommon/q_math.o \ $(B)/$(BASEGAME)/qcommon/q_shared.o -Q3UIOBJ = $(Q3UIOBJ_) $(B)/$(BASEGAME)/ui/ui_syscalls.o +Q3UIOBJ = $(Q3UIOBJ_) $(B)/$(MISSIONPACK)/ui/ui_syscalls.o Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/$(BASEGAME)/ui$(SHLIBNAME): $(Q3UIOBJ) @@ -2255,17 +2314,17 @@ $(B)/$(BASEGAME)/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM) ############################################################################# MPUIOBJ_ = \ - $(B)/$(BASEGAME)/ui/ui_main.o \ - $(B)/$(BASEGAME)/ui/ui_atoms.o \ - $(B)/$(BASEGAME)/ui/ui_gameinfo.o \ - $(B)/$(BASEGAME)/ui/ui_players.o \ - $(B)/$(BASEGAME)/ui/ui_shared.o \ + $(B)/$(MISSIONPACK)/ui/ui_main.o \ + $(B)/$(MISSIONPACK)/ui/ui_atoms.o \ + $(B)/$(MISSIONPACK)/ui/ui_gameinfo.o \ + $(B)/$(MISSIONPACK)/ui/ui_players.o \ + $(B)/$(MISSIONPACK)/ui/ui_shared.o \ \ - $(B)/$(BASEGAME)/ui/bg_misc.o \ - $(B)/$(BASEGAME)/ui/bg_lib.o \ + $(B)/$(MISSIONPACK)/ui/bg_misc.o \ + $(B)/$(MISSIONPACK)/ui/bg_lib.o \ \ - $(B)/$(BASEGAME)/qcommon/q_math.o \ - $(B)/$(BASEGAME)/qcommon/q_shared.o + $(B)/$(MISSIONPACK)/qcommon/q_math.o \ + $(B)/$(MISSIONPACK)/qcommon/q_shared.o MPUIOBJ = $(MPUIOBJ_) $(B)/$(MISSIONPACK)/ui/ui_syscalls.o MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) @@ -2336,8 +2395,14 @@ $(B)/renderer/%.o: $(JPDIR)/%.c $(B)/renderer/%.o: $(RDIR)/%.c $(DO_REF_CC) - -$(B)/renderergl2/%.o: $(R2DIR)/%.c + +$(B)/rend2/glsl/%.c: $(R2DIR)/glsl/%.glsl + $(DO_REF_STR) + +$(B)/rend2/glsl/%.o: $(B)/rend2/glsl/%.c + $(DO_REF_CC) + +$(B)/rend2/%.o: $(R2DIR)/%.c $(DO_REF_CC) @@ -2464,16 +2529,19 @@ $(B)/$(MISSIONPACK)/qcommon/%.asm: $(CMDIR)/%.c $(Q3LCC) # MISC ############################################################################# -OBJ = $(Q3OBJ) $(Q3ROBJ) $(Q3R2OBJ) $(Q3DOBJ) $(JPGOBJ) \ +OBJ = $(Q3OBJ) $(Q3ROBJ) $(Q3R2OBJ) $(Q3RPOBJ_UP) $(Q3RPOBJ_SMP) $(Q3DOBJ) $(JPGOBJ) \ $(MPGOBJ) $(Q3GOBJ) $(Q3CGOBJ) $(MPCGOBJ) $(Q3UIOBJ) $(MPUIOBJ) \ $(MPGVMOBJ) $(Q3GVMOBJ) $(Q3CGVMOBJ) $(MPCGVMOBJ) $(Q3UIVMOBJ) $(MPUIVMOBJ) TOOLSOBJ = $(LBURGOBJ) $(Q3CPPOBJ) $(Q3RCCOBJ) $(Q3LCCOBJ) $(Q3ASMOBJ) +STRINGOBJ = $(Q3R2STRINGOBJ) copyfiles: release @if [ ! -d $(COPYDIR)/$(BASEGAME) ]; then echo "You need to set COPYDIR to where your Quake3 data is!"; fi ifneq ($(BUILD_GAME_SO),0) + ifneq ($(BUILD_BASEGAME),0) -$(MKDIR) -p -m 0755 $(COPYDIR)/$(BASEGAME) + endif ifneq ($(BUILD_MISSIONPACK),0) -$(MKDIR) -p -m 0755 $(COPYDIR)/$(MISSIONPACK) endif @@ -2483,8 +2551,8 @@ ifneq ($(BUILD_CLIENT),0) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(CLIENTBIN)$(FULLBINEXT) $(COPYBINDIR)/$(CLIENTBIN)$(FULLBINEXT) ifneq ($(USE_RENDERER_DLOPEN),0) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl1_$(SHLIBNAME) - ifneq ($(BUILD_RENDERER_GL2),0) - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl2_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl2_$(SHLIBNAME) + ifneq ($(BUILD_RENDERER_REND2),0) + $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_rend2_$(SHLIBNAME) $(COPYBINDIR)/renderer_rend2_$(SHLIBNAME) endif endif endif @@ -2505,14 +2573,15 @@ ifneq ($(BUILD_SERVER),0) endif ifneq ($(BUILD_GAME_SO),0) + ifneq ($(BUILD_BASEGAME),0) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/cgame$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/qagame$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(BASEGAME)/ui$(SHLIBNAME) \ $(COPYDIR)/$(BASEGAME)/. + endif ifneq ($(BUILD_MISSIONPACK),0) - -$(MKDIR) -p -m 0755 $(COPYDIR)/$(MISSIONPACK) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(MISSIONPACK)/cgame$(SHLIBNAME) \ $(COPYDIR)/$(MISSIONPACK)/. $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(MISSIONPACK)/qagame$(SHLIBNAME) \ @@ -2539,6 +2608,7 @@ clean2: @echo "CLEAN $(B)" @rm -f $(OBJ) @rm -f $(OBJ_D_FILES) + @rm -f $(STRINGOBJ) @rm -f $(TARGETS) toolsclean: toolsclean-debug toolsclean-release diff --git a/reaction/Makefile.local b/reaction/Makefile.local index 53e191de..133d0db4 100644 --- a/reaction/Makefile.local +++ b/reaction/Makefile.local @@ -7,5 +7,4 @@ BUILD_GAME_SO = 1 BUILD_GAME_QVM = 1 BUILD_MISSIONPACK = 0 USE_RENDERER_DLOPEN = 1 -BUILD_RENDERER_GL2 = 1 - +BUILD_RENDERER_REND2 = 1