Move the q3 files into the plugins subdir.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6216 fc73d0e0-1445-4013-8a0c-d673dee63da5

CMakeLists.txt

@@ -759,48 +759,46 @@ SET(FTE_CLIENT_FILES
 	${FTE_VK_FILES}
 )
 
-SET(FTE_BOTLIB_FILES
-	engine/botlib/be_aas_bspq3.c
-	engine/botlib/be_aas_entity.c
-	engine/botlib/be_aas_move.c
-	engine/botlib/be_aas_routealt.c
-	engine/botlib/be_ai_char.c
-	engine/botlib/be_ai_goal.c
-	engine/botlib/be_ai_weight.c
-	engine/botlib/l_crc.c
-	engine/botlib/l_memory.c
-	engine/botlib/l_struct.c
-	engine/botlib/be_aas_cluster.c
-	engine/botlib/be_aas_file.c
-	engine/botlib/be_aas_optimize.c
-	engine/botlib/be_aas_route.c
-	engine/botlib/be_ai_chat.c
-	engine/botlib/be_ai_move.c
-	engine/botlib/be_ea.c
-	engine/botlib/l_libvar.c
-	engine/botlib/l_precomp.c
-	engine/botlib/be_aas_debug.c
-	engine/botlib/be_aas_main.c
-	engine/botlib/be_aas_reach.c
-	engine/botlib/be_aas_sample.c
-	engine/botlib/be_ai_gen.c
-	engine/botlib/be_ai_weap.c
-	engine/botlib/be_interface.c
-	engine/botlib/l_log.c
-	engine/botlib/l_script.c
-	engine/botlib/standalone.c
-)
 SET(FTE_Q3_FILES
-	${FTE_BOTLIB_FILES}
-	engine/client/cl_cg.c
-	engine/client/cl_ui.c
-	engine/client/clq3_parse.c
-	engine/server/svq3_game.c
-	engine/common/q3common.c
-	engine/common/q3common.h
+	plugins/quake3/botlib/be_aas_bspq3.c
+	plugins/quake3/botlib/be_aas_entity.c
+	plugins/quake3/botlib/be_aas_move.c
+	plugins/quake3/botlib/be_aas_routealt.c
+	plugins/quake3/botlib/be_ai_char.c
+	plugins/quake3/botlib/be_ai_goal.c
+	plugins/quake3/botlib/be_ai_weight.c
+	plugins/quake3/botlib/l_crc.c
+	plugins/quake3/botlib/l_memory.c
+	plugins/quake3/botlib/l_struct.c
+	plugins/quake3/botlib/be_aas_cluster.c
+	plugins/quake3/botlib/be_aas_file.c
+	plugins/quake3/botlib/be_aas_optimize.c
+	plugins/quake3/botlib/be_aas_route.c
+	plugins/quake3/botlib/be_ai_chat.c
+	plugins/quake3/botlib/be_ai_move.c
+	plugins/quake3/botlib/be_ea.c
+	plugins/quake3/botlib/l_libvar.c
+	plugins/quake3/botlib/l_precomp.c
+	plugins/quake3/botlib/be_aas_debug.c
+	plugins/quake3/botlib/be_aas_main.c
+	plugins/quake3/botlib/be_aas_reach.c
+	plugins/quake3/botlib/be_aas_sample.c
+	plugins/quake3/botlib/be_ai_gen.c
+	plugins/quake3/botlib/be_ai_weap.c
+	plugins/quake3/botlib/be_interface.c
+	plugins/quake3/botlib/l_log.c
+	plugins/quake3/botlib/l_script.c
+	plugins/quake3/botlib/standalone.c
 
-	engine/client/clq3defs.h
-	engine/server/q3g_public.h
+	plugins/quake3/clq3_cg.c
+	plugins/quake3/clq3_ui.c
+	plugins/quake3/clq3_parse.c
+	plugins/quake3/svq3_game.c
+	plugins/quake3/q3common.c
+	plugins/quake3/q3common.h
+
+	plugins/quake3/clq3defs.h
+	plugins/quake3/q3g_public.h
 )
 
 SET(FTE_PLUG_QUAKE3 true CACHE BOOL "Compile Quake3 plugin.")

engine/Makefile

@@ -570,7 +570,6 @@ HTTP_DIR=$(BASE_DIR)/http
 LIBS_DIR?=.
 PROGS_DIR=$(BASE_DIR)/qclib
 NACL_DIR=$(BASE_DIR)/nacl
-BOTLIB_DIR=$(BASE_DIR)/botlib
 
 ifeq ($(NOCOMPAT),1)
 	NCCFLAGS=-DNOLEGACY -DOMIT_QCC
@@ -713,6 +712,8 @@ ifeq ($(FTE_TARGET),SDL2)
 	BASE_CFLAGS+=-DLIBJPEG_STATIC -DLIBJPEG_STATIC -DLIBPNG_STATIC -DOPUS_STATIC -DSPEEX_STATIC -DFREETYPE_STATIC -DLIBVORBISFILE_STATIC
 endif
 
+VPATH := $(BASE_DIR) : $(CLIENT_DIR) : $(GL_DIR) : $(SW_DIR) : $(COMMON_DIR) : $(SERVER_DIR) : $(HTTP_DIR) : $(QUX_DIR) : $(PROGS_DIR) : $(NACL_DIR) : $(D3D_DIR) : $(VK_DIR) : $(BASE_DIR)/web
+
 PROFILE_CFLAGS=-pg
 DX7SDK=-I./libs/dxsdk7/include/
 
@@ -945,11 +946,12 @@ COMMON_OBJS = \
 	q2pmove.o
 
 ifeq (1,$(LINK_QUAKE3))
-	ALL_CFLAGS+=-I$(BOTLIB_DIR) -DBOTLIB -DBOTLIB_STATIC -DSTATIC_Q3
+    VPATH := $(VPATH) : $(BASE_DIR)/../plugins/quake3 : $(BASE_DIR)/../plugins/quake3/botlib
+    ALL_CFLAGS+=-DBOTLIB -DBOTLIB_STATIC -DSTATIC_Q3
     COMMON_OBJS += 			\
 		clq3_parse.o	\
-		cl_ui.o	\
-		cl_cg.o \
+		clq3_ui.o	\
+		clq3_cg.o 	\
 		svq3_game.o	\
 		q3common.o	\
 		be_aas_bspq3.o		\
@@ -1888,8 +1890,6 @@ ifneq ($(OUT_DIR),)
 endif
 
 
-VPATH = $(BASE_DIR) : $(CLIENT_DIR) : $(GL_DIR) : $(SW_DIR) : $(COMMON_DIR) : $(SERVER_DIR) : $(HTTP_DIR) : $(BASE_DIR)/irc : $(BASE_DIR)/email : $(QUX_DIR) : $(PROGS_DIR) : $(NACL_DIR) : $(D3D_DIR) : $(VK_DIR) : $(BOTLIB_DIR) : $(BASE_DIR)/web
-
 DO_WINDRES?=$(DO_ECHO) $(WINDRES) $(BRANDFLAGS) -I$(CLIENT_DIR) -O coff $< $@
 
 # This is for linking the FTE icon to the MinGW target

engine/client/quakedef.h

@@ -207,7 +207,9 @@ extern "C" {
 #endif
 #endif
 
+#if defined(Q3CLIENT) || defined(Q3SERVER)
 #include "q3api.h"
+#endif
 
 #ifdef __cplusplus
 	#define q_max(a,b) ((a) > (b) ? (a) : (b))

engine/server/botlib.h

@@ -1 +0,0 @@
-#include "../botlib/botlib.h"

plugins/Makefile

@@ -360,42 +360,42 @@ endif
 ######################################
 #quake3
 
-BOTLIBFILES=../engine/botlib/be_aas_bspq3.c		\
-			../engine/botlib/be_aas_cluster.c	\
-			../engine/botlib/be_aas_debug.c		\
-			../engine/botlib/be_aas_entity.c	\
-			../engine/botlib/be_aas_file.c		\
-			../engine/botlib/be_aas_main.c		\
-			../engine/botlib/be_aas_move.c		\
-			../engine/botlib/be_aas_optimize.c	\
-			../engine/botlib/be_aas_reach.c		\
-			../engine/botlib/be_aas_routealt.c	\
-			../engine/botlib/be_aas_route.c		\
-			../engine/botlib/be_aas_sample.c	\
-			../engine/botlib/be_ai_char.c		\
-			../engine/botlib/be_ai_chat.c		\
-			../engine/botlib/be_ai_gen.c	\
-			../engine/botlib/be_ai_goal.c	\
-			../engine/botlib/be_ai_move.c	\
-			../engine/botlib/be_ai_weap.c	\
-			../engine/botlib/be_ai_weight.c	\
-			../engine/botlib/be_ea.c		\
-			../engine/botlib/be_interface.c	\
-			../engine/botlib/l_crc.c		\
-			../engine/botlib/l_libvar.c		\
-			../engine/botlib/l_log.c		\
-			../engine/botlib/l_memory.c		\
-			../engine/botlib/l_precomp.c	\
-			../engine/botlib/l_script.c		\
-			../engine/botlib/l_struct.c		\
-			../engine/botlib/standalone.c
+BOTLIBFILES=quake3/botlib/be_aas_bspq3.c		\
+			quake3/botlib/be_aas_cluster.c	\
+			quake3/botlib/be_aas_debug.c		\
+			quake3/botlib/be_aas_entity.c	\
+			quake3/botlib/be_aas_file.c		\
+			quake3/botlib/be_aas_main.c		\
+			quake3/botlib/be_aas_move.c		\
+			quake3/botlib/be_aas_optimize.c	\
+			quake3/botlib/be_aas_reach.c		\
+			quake3/botlib/be_aas_routealt.c	\
+			quake3/botlib/be_aas_route.c		\
+			quake3/botlib/be_aas_sample.c	\
+			quake3/botlib/be_ai_char.c		\
+			quake3/botlib/be_ai_chat.c		\
+			quake3/botlib/be_ai_gen.c	\
+			quake3/botlib/be_ai_goal.c	\
+			quake3/botlib/be_ai_move.c	\
+			quake3/botlib/be_ai_weap.c	\
+			quake3/botlib/be_ai_weight.c	\
+			quake3/botlib/be_ea.c		\
+			quake3/botlib/be_interface.c	\
+			quake3/botlib/l_crc.c		\
+			quake3/botlib/l_libvar.c		\
+			quake3/botlib/l_log.c		\
+			quake3/botlib/l_memory.c		\
+			quake3/botlib/l_precomp.c	\
+			quake3/botlib/l_script.c		\
+			quake3/botlib/l_struct.c		\
+			quake3/botlib/standalone.c
 QUAKE3FILES=$(BOTLIBFILES)	\
 			plugin.c		\
-			../engine/client/cl_cg.c		\
-			../engine/client/cl_ui.c		\
-			../engine/client/clq3_parse.c	\
-			../engine/server/svq3_game.c	\
-			../engine/common/q3common.c
+			quake3/clq3_cg.c		\
+			quake3/clq3_ui.c		\
+			quake3/clq3_parse.c	\
+			quake3/svq3_game.c	\
+			quake3/q3common.c
 $(PLUG_PREFIX)quake3$(PLUG_NATIVE_EXT): ${QUAKE3FILES}
 	$(CC) $(BASE_CFLAGS) $(CFLAGS) -DFTEPLUGIN -DBOTLIB -DBOTLIB_STATIC -o $@ -shared $(PLUG_CFLAGS) $^ $(PLUG_DEFFILE) $(PLUG_LDFLAGS_ZLIB) $(PLUG_LDFLAGS)
 	$(call EMBEDMETA,quake3,$@,Quake3 Compat,Quake3 Gamecode Compatibility)

plugins/quake3/clq3_ui.c

@@ -7,7 +7,7 @@
 
 static int keycatcher;
 
-#include "botlib.h"
+#include "botlib/botlib.h"
 void SV_InitBotLib(void);
 extern botlib_export_t *botlib;
 qboolean CG_GetLimboString(int index, char *outbuf);

plugins/quake3/svq3_game.c

@@ -13,7 +13,7 @@
 #define fileHandle_t int
 #define fsMode_t int
 #define pc_token_t void
-#include "botlib.h"
+#include "botlib/botlib.h"
 
 #define Z_TAG_BOTLIB 221726
 static zonegroup_t botlibmem;