replaced sbarpic_t with cachepic_t in sbar code (saves a bit of memory)

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 7354784eb730b8e07b8bb9f36414b07c9b679130..427f937907f41f3fd043286d5da9ff9b5bca26eb 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -91,6 +91,7 @@ OBJ_COMMON= \
        lhnet.o \
        mathlib.o \
        matrixlib.o \
+       mdfour.o \
        menu.o \
        meshqueue.o \
        model_alias.o \
@@ -172,6 +173,9 @@ LDFLAGS_UNIXSDL=`sdl-config --libs`
 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
 
@@ -202,6 +206,7 @@ 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 #####
@@ -237,7 +242,7 @@ OBJ_WINCD=cd_win.o
 #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
@@ -247,6 +252,9 @@ LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs`
 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 #####
@@ -265,15 +273,19 @@ help:
        @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 :
@@ -285,6 +297,9 @@ profile :
 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) \
@@ -300,6 +315,11 @@ cl-release :
                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) \
@@ -315,6 +335,11 @@ sv-release :
                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) \
@@ -330,6 +355,11 @@ sdl-release :
                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) =========="
@@ -373,21 +403,36 @@ cd_sdl.o: cd_sdl.c
 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