Fix loading of external Q1BSP textures. Does not fix skybox. Causes console spam

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 36aad5f7fd2d5d69bb27e97d9f4310c9a52b9f43..f903bef183c9439d200a69d49c3df2763f17c3f8 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -82,18 +82,24 @@ OBJ_COMMON= \
        cl_cmd.o \
        cl_collision.o \
        cl_demo.o \
-       cl_entframe.o \
-       cl_entframe_quake.o \
+       cl_ents.o \
+       cl_ents4.o \
+       cl_ents5.o \
+       cl_ents_nq.o \
+       cl_ents_qw.o \
        cl_input.o \
        cl_main.o \
        cl_parse.o \
        cl_particles.o \
        cl_screen.o \
        cl_video.o \
+       cl_video_libavw.o \
        clvm_cmds.o \
        cmd.o \
        collision.o \
        com_crc16.o \
+       com_ents.o \
+       com_ents4.o \
        com_msg.o \
        common.o \
        console.o \
@@ -146,8 +152,11 @@ OBJ_COMMON= \
        sbar.o \
        sv_ccmds.o \
        sv_demo.o \
-       sv_entframe_csqc.o \
-       sv_entframe_quake.o \
+       sv_ents.o \
+       sv_ents4.o \
+       sv_ents5.o \
+       sv_ents_csqc.o \
+       sv_ents_nq.o \
        sv_main.o \
        sv_move.o \
        sv_phys.o \
@@ -171,7 +180,7 @@ OBJ_MENU= \
 # note that builddate.c is very intentionally not compiled to a .o before
 # being linked, because it should be recompiled every time an executable is
 # built to give the executable a proper date string
-OBJ_SV= builddate.c sys_linux.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON)
+OBJ_SV= builddate.c sys_unix.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON)
 OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMMON) $(OBJ_SND_XMP) snd_sdl.o $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)