new menu QC builtin "stringwidth(string text, float handleColors)", does not do anyth...

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 8dc32881da78b4caf17c6d4f84b9f044e32ab7cc..2d19f8239b74f50f82230bf3722537803bccae00 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -117,6 +117,7 @@ OBJ_COMMON= \
        r_sky.o \
        r_sprites.o \
        sbar.o \
+       sv_demo.o \
        sv_main.o \
        sv_move.o \
        sv_phys.o \
@@ -238,6 +239,7 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL)
 
 ##### Win32 specific variables #####
 
+WINDRES ?= windres
 #if you want CD sound in Win32
 OBJ_WINCD=cd_win.o
 #if you want no CD audio
@@ -247,9 +249,9 @@ OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $
 
 # Link
 # Note that Windows Vista users may need --large-address-aware because Vista seems to map over 500MB of application address space for its own purposes, which is a significant chunk taken out of the default 2GB address space, this option raises the limit to 4GB (or 3GB on Vista 32 and older versions of Windows).
-LDFLAGS_WINCOMMON=-lwinmm -lwsock32 -Wl,--large-address-aware
-LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
-LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole
+LDFLAGS_WINCOMMON=-lws2_32 -Wl,--large-address-aware
+LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -lwinmm -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
+LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole -lwinmm
 LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `$(SDL_CONFIG) --libs`
 EXE_WINCL=darkplaces.exe
 EXE_WINSV=darkplaces-dedicated.exe
@@ -403,10 +405,10 @@ cd_sdl.o: cd_sdl.c
        $(DO_CC) $(CFLAGS_SDL)
 
 darkplaces.o: %.o : %.rc
-       windres -o $@ $<
+       $(WINDRES) -o $@ $<
 
 nexuiz.o: %.o : %.rc
-       windres -o $@ $<
+       $(WINDRES) -o $@ $<
 
 .c.o:
        $(DO_CC)