diff --git a/engine/Makefile b/engine/Makefile index e5e2fcb16..fd44b9020 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -722,7 +722,6 @@ DX7SDK=-I./libs/dxsdk7/include/ GLCFLAGS?=-DGLQUAKE D3DCFLAGS?=-DD3D9QUAKE -DD3D11QUAKE VKCFLAGS?=-DVKQUAKE -NPFTECFLAGS=-DNPFTE CLIENT_OBJS = \ textedit.o \ @@ -1510,12 +1509,6 @@ ifneq (,$(findstring linux,$(FTE_TARGET))) endif QCC_DIR=linqcc$(BITS) - - NPFTE_OBJS=httpclient.o image.o sys_linux_threads.o sys_npfte.o sys_axfte.o sys_plugfte.o - NPFTE_DLL_NAME=../npfte$(BITS).so - NPFTE_LDFLAGS=-shared -Wl,-z,defs -ldl -lpthread - NPFTE_CFLAGS=$(NPFTECFLAGS) $(W32_CFLAGS) -DMULTITHREAD -fPIC -DDYNAMIC_LIBPNG -DDYNAMIC_LIBJPEG - NPFTEB_DIR=npfte_linux$(BITS) GLCL_OBJS=$(GL_OBJS) $(D3DGL_OBJS) $(GLQUAKE_OBJS) gl_vidlinuxglx.o gl_vidwayland.o gl_videgl.o snd_pulse.o snd_alsa.o snd_linux.o snd_sdl.o cd_linux.o sys_linux.o sys_linux_threads.o GL_EXE_NAME=../$(EXE_NAME)-gl$(BITS) @@ -1815,7 +1808,6 @@ releases: # -$(MAKE) FTE_TARGET=win32 relcl -$(MAKE) droid-rel -$(MAKE) web-rel - -$(MAKE) FTE_TARGET=win32 npfte-rel autoconfig: clean /bin/bash makeconfig.sh y @@ -2128,14 +2120,13 @@ help: @-echo "'glcl-???' (currently broken)" @-echo "'droid-???' (cross compiles Android package)" @-echo "'web-???' (compiles javascript/emscripten page)" - @-echo "'npfte-???' (cross compiles QuakeTV Firefox/Netscape browser plugin)" @-echo "" @-echo "Cross targets can be specified with FTE_TARGET=blah" @-echo "linux32, linux64 specify specific x86 archs" @-echo "SDL - Attempt to use sdl for the current target" @-echo "win32 - Mingw compile for win32" @-echo "vc - Attempts to use msvc8+ to compile. Note: uses profile guided optimisations. You must build+run the relevent profile target before a release target will compile properly. Debug doesn't care." - @-echo "android, npfte, targets explicitly cross compile, and should generally not be given an FTE_TARGET." + @-echo "android targets explicitly cross compile, and should generally not be given an FTE_TARGET." clean: -rm -f -r $(RELEASE_DIR) @@ -2154,34 +2145,6 @@ distclean: clean -rm -f -r libs/SDL2-$(SDL2VER) -################################################# -#npfte - -npfte-tmprel: reldir - @$(MAKE) $(OUT_DIR)/$(EXE_NAME) OUT_DIR="$(OUT_DIR)" WCFLAGS="$(NPFTE_CFLAGS) $(RELEASE_CFLAGS)" LDFLAGS="$(NPFTE_LDFLAGS) $(LDFLAGS) $(RELEASE_LDFLAGS)" OBJS="NPFTE_OBJS" -npfte-tmpdbg: debugdir - @$(MAKE) $(OUT_DIR)/$(EXE_NAME) OUT_DIR="$(OUT_DIR)" WCFLAGS="$(NPFTE_CFLAGS) $(DEBUG_CFLAGS)" LDFLAGS="$(NPFTE_LDFLAGS) $(LDFLAGS) $(DEBUG_LDFLAGS)" OBJS="NPFTE_OBJS" -npfte-rel: - -@$(MAKE) npfte-tmprel OUT_DIR="$(RELEASE_DIR)/$(NPFTEB_DIR)w32" EXE_NAME="../npfte.dll" PRECOMPHEADERS="" FTE_TARGET=win32 - -@$(MAKE) npfte-tmprel OUT_DIR="$(RELEASE_DIR)/$(NPFTEB_DIR)l32" EXE_NAME="../npfte32.so" PRECOMPHEADERS="" FTE_TARGET=linux32 - -@$(MAKE) npfte-tmprel OUT_DIR="$(RELEASE_DIR)/$(NPFTEB_DIR)l64" EXE_NAME="../npfte64.so" PRECOMPHEADERS="" FTE_TARGET=linux64 - -cp $(RELEASE_DIR)/npfte.dll npfte/plugins - -cp $(RELEASE_DIR)/npfte32.so npfte/plugins - -cp $(RELEASE_DIR)/npfte64.so npfte/plugins - cd npfte && zip $(abspath $(RELEASE_DIR)/npfte.xpi) install.rdf plugins/npfte.dll plugins/npfte32.so plugins/npfte64.so - rm -rf /tmp/npfte - mkdir /tmp/npfte - cp $(RELEASE_DIR)/npfte.dll /tmp/npfte - cp ./npfte/manifest.json /tmp/npfte - -cd $(RELEASE_DIR)/ && ../npfte/crxmake.sh /tmp/npfte ../npfte/chrome.pem - rm -rf /tmp/npfte -npfte-dbg: - @$(MAKE) npfte-tmpdbg OUT_DIR="$(DEBUG_DIR)/$(NPFTEB_DIR)w32" EXE_NAME="../npfte.dll" PRECOMPHEADERS="" FTE_TARGET=win32 - @$(MAKE) npfte-tmpdbg OUT_DIR="$(DEBUG_DIR)/$(NPFTEB_DIR)l32" EXE_NAME="../npfte32.so" PRECOMPHEADERS="" FTE_TARGET=linux32 - @$(MAKE) npfte-tmpdbg OUT_DIR="$(DEBUG_DIR)/$(NPFTEB_DIR)l64" EXE_NAME="../npfte64.so" PRECOMPHEADERS="" FTE_TARGET=linux64 -npfte-profile: - @$(MAKE) npfte-tmp TYPE=_npfte-profile OUT_DIR="$(PROFILE_DIR)/$(NPFTEB_DIR)" - ################################################# #webgl helpers diff --git a/engine/dotnet2005/ftequake.sln b/engine/dotnet2005/ftequake.sln index b566f7f67..feac62871 100644 --- a/engine/dotnet2005/ftequake.sln +++ b/engine/dotnet2005/ftequake.sln @@ -35,8 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dedserver", "dedserver.vcpr {0018E098-B12A-4E4D-9B22-6772DA287080} = {0018E098-B12A-4E4D-9B22-6772DA287080} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npfte", "npfte.vcproj", "{88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "irc", "..\..\plugins\irc\irc.vcproj", "{6ABD62A3-C5A0-43E8-BA4F-84606057774F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "private", "..\..\plugins\private\private.vcproj", "{74542CA7-48C1-4664-9007-66F751131EA3}" diff --git a/engine/dotnet2008/ftequake.sln b/engine/dotnet2008/ftequake.sln index e7a2e6671..b0f5a43ff 100644 --- a/engine/dotnet2008/ftequake.sln +++ b/engine/dotnet2008/ftequake.sln @@ -7,11 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftequake", "ftequake.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftequake_SDL", "ftequake_SDL.vcproj", "{F384725A-62D4-4063-9941-6D8D2D6C2A47}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npfte", "npfte.vcproj", "{88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}" - ProjectSection(ProjectDependencies) = postProject - {0018E098-B12A-4E4D-9B22-6772DA287080} = {0018E098-B12A-4E4D-9B22-6772DA287080} - EndProjectSection -EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FTEQuake", "..\setup\setup.vdproj", "{E0EE8B50-3A75-42A9-B80A-787675979B0C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtvprox", "..\..\fteqtv\qtvprox.vcproj", "{1A353DA0-F351-4C0D-A21D-E2B460600B20}" diff --git a/engine/dotnet2010/ftequake.sln b/engine/dotnet2010/ftequake.sln index 66aa9e919..6f9dae1a6 100644 --- a/engine/dotnet2010/ftequake.sln +++ b/engine/dotnet2010/ftequake.sln @@ -4,8 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftequake", "ftequake.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftequake", "ftequake_SDL.vcxproj", "{F384725A-62D4-4063-9941-6D8D2D6C2A47}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npfte", "npfte.vcxproj", "{88BFEE0E-7BC0-43AD-9CCC-6B1A6E4C1365}" -EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FTEQuake", "..\setup\setup.vdproj", "{E0EE8B50-3A75-42A9-B80A-787675979B0C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtvprox", "..\..\fteqtv\qtvprox.vcproj", "{1A353DA0-F351-4C0D-A21D-E2B460600B20}"