# Core Audio (Mac OS X)
OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.c
-LIB_SND_COREAUDIO=
+LIB_SND_COREAUDIO=-framework CoreAudio
# BSD / Sun audio API (NetBSD and OpenBSD)
OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o
# Common objects
OBJ_COMMON= \
cd_shared.o \
- cgame.o \
- cgamevm.o \
cl_collision.o \
cl_demo.o \
cl_input.o \
cl_particles.o \
cl_screen.o \
cl_video.o \
+ clvm_cmds.o \
cmd.o \
collision.o \
common.o \
console.o \
+ csprogs.o \
curves.o \
cvar.o \
dpvsimpledecode.o \
host.o \
host_cmd.o \
image.o \
+ image_png.o \
jpeg.o \
keys.o \
lhnet.o \
mathlib.o \
matrixlib.o \
+ mdfour.o \
menu.o \
meshqueue.o \
model_alias.o \
sv_user.o \
svvm_cmds.o \
sys_shared.o \
- ui.o \
vid_shared.o \
view.o \
wad.o \
world.o \
+ world_cs.o \
zone.o
# note that builddate.c is very intentionally not compiled to a .o before
EXE_UNIXCL=darkplaces-glx
EXE_UNIXSV=darkplaces-dedicated
EXE_UNIXSDL=darkplaces-sdl
+EXE_UNIXCLNEXUIZ=nexuiz-glx
+EXE_UNIXSVNEXUIZ=nexuiz-dedicated
+EXE_UNIXSDLNEXUIZ=nexuiz-sdl
CMD_UNIXRM=rm -rf
##### Mac OS X specific variables #####
-# If you want CD sound in Mac OS X
-#OBJ_MACOSXCD=cd_macosx.o
-# If you want no CD audio
+# No CD support available
OBJ_MACOSXCD=$(OBJ_NOCD)
# Link
-LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL)
+LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework Carbon $(LIB_SOUND)
LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `sdl-config --static-libs`
OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
+EXE_MACOSXCL=darkplaces-agl
+EXE_MACOSXCLNEXUIZ=nexuiz-agl
+
+
##### SunOS specific variables #####
# No CD support available
#if you want no CD audio
#OBJ_WINCD=$(OBJ_NOCD)
-OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON)
+OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON)
# Link
LDFLAGS_WINCOMMON=-lwinmm -lwsock32
EXE_WINCL=darkplaces.exe
EXE_WINSV=darkplaces-dedicated.exe
EXE_WINSDL=darkplaces-sdl.exe
+EXE_WINCLNEXUIZ=nexuiz.exe
+EXE_WINSVNEXUIZ=nexuiz-dedicated.exe
+EXE_WINSDLNEXUIZ=nexuiz-sdl.exe
##### Commands #####
@echo "* $(MAKE) debug : make client and server binaries (debug versions)"
@echo "* $(MAKE) profile : make client and server binaries (profile versions)"
@echo "* $(MAKE) release : make client and server binaries (release versions)"
+ @echo "* $(MAKE) nexuiz : make client and server binaries with nexuiz icon (release versions)"
@echo "* $(MAKE) cl-debug : make client (debug version)"
@echo "* $(MAKE) cl-profile : make client (profile version)"
@echo "* $(MAKE) cl-release : make client (release version)"
+ @echo "* $(MAKE) cl-nexuiz : make client with nexuiz icon (release version)"
@echo "* $(MAKE) sv-debug : make dedicated server (debug version)"
@echo "* $(MAKE) sv-profile : make dedicated server (profile version)"
@echo "* $(MAKE) sv-release : make dedicated server (release version)"
+ @echo "* $(MAKE) sv-nexuiz : make dedicated server with nexuiz icon (release version)"
@echo "* $(MAKE) sdl-debug : make SDL client (debug version)"
@echo "* $(MAKE) sdl-profile : make SDL client (profile version)"
@echo "* $(MAKE) sdl-release : make SDL client (release version)"
+ @echo "* $(MAKE) sdl-nexuiz : make SDL client with nexuiz icon (release version)"
@echo
debug :
release :
$(MAKE) sv-release cl-release sdl-release
+nexuiz :
+ $(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz
+
cl-debug :
$(MAKE) bin-debug \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
+cl-nexuiz :
+ $(MAKE) bin-release \
+ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+ EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
+
sv-debug :
$(MAKE) bin-debug \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
+sv-nexuiz :
+ $(MAKE) bin-release \
+ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+ EXE="$(EXE_SVNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
+
sdl-debug :
$(MAKE) bin-debug \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
+sdl-nexuiz :
+ $(MAKE) bin-release \
+ DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+ EXE="$(EXE_SDLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
+
bin-debug :
@echo
@echo "========== $(EXE) (debug) =========="
darkplaces.o: %.o : %.rc
windres -o $@ $<
+nexuiz.o: %.o : %.rc
+ windres -o $@ $<
+
.c.o:
$(DO_CC)
-$(EXE_CL): $(OBJ_CL)
+$(EXE_CL): $(OBJ_CL) $(OBJ_ICON)
+ $(DO_LD)
+
+$(EXE_SV): $(OBJ_SV) $(OBJ_ICON)
+ $(DO_LD)
+
+$(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON)
+ $(DO_LD)
+
+$(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ)
$(DO_LD)
-$(EXE_SV): $(OBJ_SV)
+$(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)
$(DO_LD)
-$(EXE_SDL): $(OBJ_SDL)
+$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
$(DO_LD)
clean:
-$(CMD_RM) $(EXE_CL)
-$(CMD_RM) $(EXE_SV)
-$(CMD_RM) $(EXE_SDL)
+ -$(CMD_RM) $(EXE_CLNEXUIZ)
+ -$(CMD_RM) $(EXE_SVNEXUIZ)
+ -$(CMD_RM) $(EXE_SDLNEXUIZ)
-$(CMD_RM) *.o
-$(CMD_RM) *.d