nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-22 20:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix nacl build, change output of web-sv for automated build

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4285 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2013-04-04 09:59:14 +00:00
parent 096beec004
commit ecc445e88f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
engine/Makefile
View file

@ -718,6 +718,9 @@ ifeq ($(FTE_TARGET),nacl)
GLCL_OBJS=$(GL_OBJS) $(D3DGL_OBJS) $(GLQUAKE_OBJS) $(SPEEX_OBJS) sys_ppapi.o cd_null.o gl_vidppapi.o fs_ppapi.o snd_ppapi.o GLCL_OBJS=$(GL_OBJS) $(D3DGL_OBJS) $(GLQUAKE_OBJS) $(SPEEX_OBJS) sys_ppapi.o cd_null.o gl_vidppapi.o fs_ppapi.o snd_ppapi.o
GL_LDFLAGS=$(GLLDFLAGS) $(OGGVORBISLDFLAGS)
M_LDFLAGS=$(GLLDFLAGS) $(OGGVORBISLDFLAGS)
GLB_DIR=gl_nacl_$(NARCH) GLB_DIR=gl_nacl_$(NARCH)
MINGL_DIR=mingl_nacl_$(NARCH) MINGL_DIR=mingl_nacl_$(NARCH)
ifeq ($(NARCH),pnacl) ifeq ($(NARCH),pnacl)
@ -1121,7 +1124,7 @@ ifeq ($(FTE_TARGET),web)
SV_DIR=sv_web SV_DIR=sv_web
#SV_LDFLAGS=-lz #SV_LDFLAGS=-lz
#SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) svmodel.o #SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) svmodel.o
SV_EXE_NAME=libftesv.js SV_EXE_NAME=../libftesv.js
#SV_LDFLAGS= #SV_LDFLAGS=