reset callcount in prvm_profile

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 7589c099f339f446914e8cf9bdbd525649db1a16..37fe92256cd619187a0117ff5d86742beef4bb52 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -75,10 +75,9 @@ OBJ_COMMON= \
        palette.o \
        polygon.o \
        portals.o \
-       pr_cmds.o \
-       pr_edict.o \
-       pr_exec.o \
        protocol.o \
+       mvm_cmds.o \
+       svvm_cmds.o \
        prvm_cmds.o \
        prvm_edict.o \
        prvm_exec.o \
@@ -187,6 +186,21 @@ LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
 
 OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
 
+##### SunOS specific variables #####
+
+OBJ_SUNOSSOUND=$(OBJ_OSSSOUND)
+LIB_SUNOSSOUND=$(LIB_OSSSOUND)
+
+# No CD support available
+OBJ_SUNOSCD=$(OBJ_NOCD)
+
+CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP
+
+# Link
+LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXCL)
+LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl
+LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL)
+
 
 ##### BSD specific variables #####
 
@@ -256,13 +270,13 @@ help:
        @echo
 
 debug :
-       $(MAKE) cl-debug sv-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+       $(MAKE) sdl-debug cl-debug sv-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET)
 
 profile :
-       $(MAKE) cl-profile sv-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+       $(MAKE) sdl-profile cl-profile sv-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET)
 
 release :
-       $(MAKE) cl-release sv-release DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+       $(MAKE) sdl-release cl-release sv-release DP_MAKE_TARGET=$(DP_MAKE_TARGET)
 
 cl-debug :
        $(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
@@ -304,21 +318,21 @@ bin-debug :
        @echo
        @echo "========== $(EXE) (debug) =========="
        $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
                LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
 
 bin-profile :
        @echo
        @echo "========== $(EXE) (profile) =========="
        $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
                LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
 
 bin-release :
        @echo
        @echo "========== $(EXE) (release) =========="
        $(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
                LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
        strip $(EXE)