From ecc445e88f74c06ab9e5144dc17c57ec842c4fb9 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Thu, 4 Apr 2013 09:59:14 +0000 Subject: [PATCH] fix nacl build, change output of web-sv for automated build git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4285 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/Makefile b/engine/Makefile index a8e4bc8bd..263f2ecc1 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -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 + GL_LDFLAGS=$(GLLDFLAGS) $(OGGVORBISLDFLAGS) + M_LDFLAGS=$(GLLDFLAGS) $(OGGVORBISLDFLAGS) + GLB_DIR=gl_nacl_$(NARCH) MINGL_DIR=mingl_nacl_$(NARCH) ifeq ($(NARCH),pnacl) @@ -1121,7 +1124,7 @@ ifeq ($(FTE_TARGET),web) SV_DIR=sv_web #SV_LDFLAGS=-lz #SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) svmodel.o - SV_EXE_NAME=libftesv.js + SV_EXE_NAME=../libftesv.js #SV_LDFLAGS=