From f83a1ddd6574b90bd948d773a321e74b3b2b60e2 Mon Sep 17 00:00:00 2001 From: Izuru Yakumo Date: Sun, 6 Jul 2025 22:43:57 -0300 Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=B7=E3=82=B9?= =?UTF-8?q?=E3=83=86=E3=83=A0=E3=82=92=E7=B0=A1=E7=B4=A0=E5=8C=96=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 844 +-------------------- linux_scripts/supermake | 27 - linux_scripts/supermake_native | 26 - windows_scripts/cgame.q3asm | 28 - windows_scripts/cgame_mp.q3asm | 30 - windows_scripts/game.q3asm | 43 -- windows_scripts/game_mp.q3asm | 43 -- windows_scripts/q3_ui.q3asm | 53 -- windows_scripts/ui.q3asm | 11 - windows_scripts/windows_compile_cgame.bat | 56 -- windows_scripts/windows_compile_game.bat | 69 -- windows_scripts/windows_compile_q3_ui.bat | 87 --- windows_scripts/windows_compile_readme.txt | 22 - 13 files changed, 9 insertions(+), 1330 deletions(-) delete mode 100755 linux_scripts/supermake delete mode 100755 linux_scripts/supermake_native delete mode 100644 windows_scripts/cgame.q3asm delete mode 100644 windows_scripts/cgame_mp.q3asm delete mode 100644 windows_scripts/game.q3asm delete mode 100644 windows_scripts/game_mp.q3asm delete mode 100644 windows_scripts/q3_ui.q3asm delete mode 100644 windows_scripts/ui.q3asm delete mode 100644 windows_scripts/windows_compile_cgame.bat delete mode 100644 windows_scripts/windows_compile_game.bat delete mode 100644 windows_scripts/windows_compile_q3_ui.bat delete mode 100644 windows_scripts/windows_compile_readme.txt diff --git a/Makefile b/Makefile index 41dcba1..d9d371b 100644 --- a/Makefile +++ b/Makefile @@ -23,16 +23,9 @@ ifeq ($(COMPILE_PLATFORM),mingw32) endif endif - BUILD_STANDALONE = 0 - BUILD_CLIENT = 0 - BUILD_CLIENT_SMP = 0 - BUILD_SERVER = 0 - BUILD_GAME_SO = 1 - BUILD_GAME_QVM = 1 +BUILD_GAME_SO = 0 +BUILD_GAME_QVM = 0 -ifneq ($(PLATFORM),darwin) - BUILD_CLIENT_SMP = 0 -endif ############################################################################# # @@ -139,69 +132,23 @@ endif BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH) BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH) -CDIR=$(MOUNT_DIR)/client -SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer CMDIR=$(MOUNT_DIR)/qcommon SDLDIR=$(MOUNT_DIR)/sdl -ASMDIR=$(MOUNT_DIR)/asm -SYSDIR=$(MOUNT_DIR)/sys GDIR=$(MOUNT_DIR)/game CGDIR=$(MOUNT_DIR)/cgame BLIBDIR=$(MOUNT_DIR)/botlib -NDIR=$(MOUNT_DIR)/null UIDIR=$(MOUNT_DIR)/ui Q3UIDIR=$(MOUNT_DIR)/q3_ui -JPDIR=$(MOUNT_DIR)/jpeg-6b -SPEEXDIR=$(MOUNT_DIR)/libspeex Q3ASMDIR=$(MOUNT_DIR)/tools/asm LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp Q3LCCETCDIR=$(MOUNT_DIR)/tools/lcc/etc Q3LCCSRCDIR=$(MOUNT_DIR)/tools/lcc/src -LOKISETUPDIR=misc/setup -NSISDIR=misc/nsis -SDLHDIR=$(MOUNT_DIR)/SDL12 -LIBSDIR=$(MOUNT_DIR)/libs TEMPDIR=/tmp -# set PKG_CONFIG_PATH to influence this, e.g. -# PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig -ifeq ($(shell which pkg-config > /dev/null; echo $$?),0) - CURL_CFLAGS=$(shell pkg-config --cflags libcurl) - CURL_LIBS=$(shell pkg-config --libs libcurl) - OPENAL_CFLAGS=$(shell pkg-config --cflags openal) - OPENAL_LIBS=$(shell pkg-config --libs openal) - # FIXME: introduce CLIENT_CFLAGS - SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') - SDL_LIBS=$(shell pkg-config --libs sdl) -endif -# Use sdl-config if all else fails -ifeq ($(SDL_CFLAGS),) - ifeq ($(shell which sdl-config > /dev/null; echo $$?),0) - SDL_CFLAGS=$(shell sdl-config --cflags) - SDL_LIBS=$(shell sdl-config --libs) - endif -endif - # version info -VERSION=1.36 - -USE_SVN= -ifeq ($(wildcard .svn),.svn) - SVN_REV=$(shell LANG=C svnversion .) - ifneq ($(SVN_REV),) - VERSION:=$(VERSION)_SVN$(SVN_REV) - USE_SVN=1 - endif -else -ifeq ($(wildcard .git/svn/.metadata),.git/svn/.metadata) - SVN_REV=$(shell LANG=C git svn info | awk '$$1 == "Revision:" {print $$2; exit 0}') - ifneq ($(SVN_REV),) - VERSION:=$(VERSION)_SVN$(SVN_REV) - endif -endif -endif +VERSION=$(shell git rev-list --all | wc -l) ############################################################################# @@ -232,26 +179,7 @@ ifeq ($(PLATFORM),linux) endif endif - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -pipe -DUSE_ICON $(SDL_CFLAGS) - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL - ifeq ($(USE_OPENAL_DLOPEN),1) - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - endif - endif - - ifeq ($(USE_CURL),1) - BASE_CFLAGS += -DUSE_CURL - ifeq ($(USE_CURL_DLOPEN),1) - BASE_CFLAGS += -DUSE_CURL_DLOPEN - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS - endif + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe -DUSE_ICON OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer @@ -294,32 +222,6 @@ ifeq ($(PLATFORM),linux) THREAD_LIBS=-lpthread LIBS=-ldl -lm - CLIENT_LIBS=$(SDL_LIBS) -lGL - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += -lopenal - endif - endif - - ifeq ($(USE_CURL),1) - ifneq ($(USE_CURL_DLOPEN),1) - CLIENT_LIBS += -lcurl - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - ifeq ($(USE_MUMBLE),1) - CLIENT_LIBS += -lrt - endif - -ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -I$(SDLHDIR)/include - endif - ifeq ($(ARCH),i386) # linux32 make ... BASE_CFLAGS += -m32 @@ -360,42 +262,8 @@ ifeq ($(PLATFORM),darwin) endif BASE_CFLAGS += -fno-strict-aliasing -DMACOS_X -fno-common -pipe - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL - ifneq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += -framework OpenAL - else - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - endif - endif - - ifeq ($(USE_CURL),1) - BASE_CFLAGS += -DUSE_CURL - ifneq ($(USE_CURL_DLOPEN),1) - CLIENT_LIBS += -lcurl - else - BASE_CFLAGS += -DUSE_CURL_DLOPEN - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS - CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - BASE_CFLAGS += -D_THREAD_SAFE=1 - ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -I$(SDLHDIR)/include - endif - - # We copy sdlmain before ranlib'ing it so that subversion doesn't think the file has been modified by each build. - LIBSDLMAIN=$(B)/libSDLmain.a - LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a - CLIENT_LIBS += -framework Cocoa -framework IOKit -framework OpenGL \ - $(LIBSDIR)/macosx/libSDL-1.2.0.dylib - OPTIMIZE += -ffast-math -falign-loops=16 ifneq ($(HAVE_VM_COMPILED),true) @@ -403,7 +271,6 @@ ifeq ($(PLATFORM),darwin) endif DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) SHLIBEXT=dylib @@ -429,28 +296,13 @@ ifeq ($(PLATFORM),mingw32) ARCH=x86 - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -DUSE_ICON # In the absence of wspiapi.h, require Windows XP or later ifeq ($(shell test -e $(CMDIR)/wspiapi.h; echo $$?),1) BASE_CFLAGS += -DWINVER=0x501 endif - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL - BASE_CFLAGS += $(OPENAL_CFLAGS) - ifeq ($(USE_OPENAL_DLOPEN),1) - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - else - CLIENT_LDFLAGS += $(OPENAL_LDFLAGS) - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS - endif - OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \ -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \ -fstrength-reduce @@ -461,29 +313,10 @@ ifeq ($(PLATFORM),mingw32) SHLIBCFLAGS= SHLIBLDFLAGS=-shared $(LDFLAGS) - BINEXT=.exe - LIBS= -lws2_32 -lwinmm CLIENT_LDFLAGS = -mwindows CLIENT_LIBS = -lgdi32 -lole32 -lopengl32 - ifeq ($(USE_CURL),1) - BASE_CFLAGS += -DUSE_CURL - BASE_CFLAGS += $(CURL_CFLAGS) - ifneq ($(USE_CURL_DLOPEN),1) - ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -DCURL_STATICLIB - CLIENT_LIBS += $(LIBSDIR)/win32/libcurl.a - else - CLIENT_LIBS += $(CURL_LIBS) - endif - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - ifeq ($(ARCH),x86) # build 32bit BASE_CFLAGS += -m32 @@ -492,21 +325,6 @@ ifeq ($(PLATFORM),mingw32) DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) - # libmingw32 must be linked before libSDLmain - CLIENT_LIBS += -lmingw32 - ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -I$(SDLHDIR)/include - CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ - $(LIBSDIR)/win32/libSDL.dll.a - else - BASE_CFLAGS += $(SDL_CFLAGS) - CLIENT_LIBS += $(SDL_LIBS) - endif - - - - BUILD_CLIENT_SMP = 0 - else # ifeq mingw32 ############################################################################# @@ -525,17 +343,6 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -DUSE_ICON $(SDL_CFLAGS) - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL - ifeq ($(USE_OPENAL_DLOPEN),1) - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS - endif - ifeq ($(ARCH),axp) BASE_CFLAGS += -DNO_VM_COMPILED RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ @@ -562,20 +369,6 @@ ifeq ($(PLATFORM),freebsd) # don't need -ldl (FreeBSD) LIBS=-lm - CLIENT_LIBS = - - CLIENT_LIBS += $(SDL_LIBS) -lGL - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += $(THREAD_LIBS) -lopenal - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - else # ifeq freebsd ############################################################################# @@ -587,20 +380,7 @@ ifeq ($(PLATFORM),openbsd) #default to i386, no tests done on anything else ARCH=i386 - - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON $(SDL_CFLAGS) - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL - ifeq ($(USE_OPENAL_DLOPEN),1) - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS - endif + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -DUSE_ICON $(SDL_CFLAGS) BASE_CFLAGS += -DNO_VM_COMPILED -I/usr/X11R6/include -I/usr/local/include RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \ @@ -618,20 +398,6 @@ ifeq ($(PLATFORM),openbsd) THREAD_LIBS=-lpthread LIBS=-lm - CLIENT_LIBS = - - CLIENT_LIBS += $(SDL_LIBS) -lGL - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += $(THREAD_LIBS) -lossaudio -lopenal - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) - CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - else # ifeq openbsd ############################################################################# @@ -657,9 +423,6 @@ ifeq ($(PLATFORM),netbsd) DEBUG_CFLAGS=$(BASE_CFLAGS) -g - BUILD_CLIENT = 0 - BUILD_GAME_QVM = 1 - else # ifeq netbsd ############################################################################# @@ -674,7 +437,7 @@ ifeq ($(PLATFORM),irix64) MKDIR = mkdir -p BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 \ - -I. $(SDL_CFLAGS) -I$(ROOT)/usr/include -DNO_VM_COMPILED + -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED RELEASE_CFLAGS=$(BASE_CFLAGS) -O3 DEBUG_CFLAGS=$(BASE_CFLAGS) -g @@ -712,8 +475,7 @@ ifeq ($(PLATFORM),sunos) endif endif - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -pipe -DUSE_ICON $(SDL_CFLAGS) + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe -DUSE_ICON OPTIMIZE = -O3 -ffast-math -funroll-loops @@ -752,8 +514,6 @@ ifeq ($(PLATFORM),sunos) BOTCFLAGS=-O0 - CLIENT_LIBS +=$(SDL_LIBS) -lGL -lX11 -lXext -liconv -lm - else # ifeq sunos ############################################################################# @@ -778,17 +538,6 @@ endif #SunOS TARGETS = -ifneq ($(BUILD_SERVER),0) - TARGETS += $(B)/ia_ded.$(ARCH)$(BINEXT) -endif - -ifneq ($(BUILD_CLIENT),0) - TARGETS += $(B)/ia.$(ARCH)$(BINEXT) - ifneq ($(BUILD_CLIENT_SMP),0) - TARGETS += $(B)/ia-smp.$(ARCH)$(BINEXT) - endif -endif - ifneq ($(BUILD_GAME_SO),0) TARGETS += \ $(B)/baseia/cgame$(ARCH).$(SHLIBEXT) \ @@ -806,31 +555,10 @@ ifneq ($(BUILD_GAME_QVM),0) endif endif -ifeq ($(USE_MUMBLE),1) - BASE_CFLAGS += -DUSE_MUMBLE -endif - -ifeq ($(USE_VOIP),1) - BASE_CFLAGS += -DUSE_VOIP - ifeq ($(USE_INTERNAL_SPEEX),1) - BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include - else - CLIENT_LIBS += -lspeex - endif -endif - ifdef DEFAULT_BASEDIR BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\" endif -ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -DUSE_LOCAL_HEADERS -endif - -ifeq ($(BUILD_STANDALONE),1) - BASE_CFLAGS += -DSTANDALONE -endif - ifeq ($(GENERATE_DEPENDENCIES),1) DEPEND_CFLAGS = -MMD else @@ -847,21 +575,6 @@ echo_cmd=@echo Q=@ endif -define DO_CC -$(echo_cmd) "CC $<" -$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $< -endef - -define DO_SMP_CC -$(echo_cmd) "SMP_CC $<" -$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $< -endef - -define DO_BOT_CC -$(echo_cmd) "BOT_CC $<" -$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) -DBOTLIB -o $@ -c $< -endef - ifeq ($(GENERATE_DEPENDENCIES),1) DO_QVM_DEP=cat $(@:%.o=%.d) | sed -e 's/\.o/\.asm/g' >> $(@:%.o=%.d) endif @@ -895,17 +608,6 @@ $(echo_cmd) "AS $<" $(Q)$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $< endef -define DO_DED_CC -$(echo_cmd) "DED_CC $<" -$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) -o $@ -c $< -endef - -define DO_WINDRES -$(echo_cmd) "WINDRES $<" -$(Q)$(WINDRES) -i $< -o $@ -endef - - ############################################################################# # MAIN TARGETS ############################################################################# @@ -951,12 +653,6 @@ targets: makedirs echo " $$i"; \ done @echo "" - @echo " CLIENT_LIBS:" - -@for i in $(CLIENT_LIBS); \ - do \ - echo " $$i"; \ - done - @echo "" @echo " Output:" -@for i in $(TARGETS); \ do \ @@ -970,9 +666,6 @@ endif makedirs: @if [ ! -d $(BUILD_DIR) ];then $(MKDIR) $(BUILD_DIR);fi @if [ ! -d $(B) ];then $(MKDIR) $(B);fi - @if [ ! -d $(B)/client ];then $(MKDIR) $(B)/client;fi - @if [ ! -d $(B)/clientsmp ];then $(MKDIR) $(B)/clientsmp;fi - @if [ ! -d $(B)/ded ];then $(MKDIR) $(B)/ded;fi @if [ ! -d $(B)/baseia ];then $(MKDIR) $(B)/baseia;fi @if [ ! -d $(B)/baseia/cgame ];then $(MKDIR) $(B)/baseia/cgame;fi @if [ ! -d $(B)/baseia/game ];then $(MKDIR) $(B)/baseia/game;fi @@ -1136,426 +829,6 @@ $(Q3ASM): $(Q3ASMOBJ) $(echo_cmd) "LD $@" $(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $^ $(TOOLS_LIBS) - -############################################################################# -# CLIENT/SERVER -############################################################################# - -Q3OBJ = \ - $(B)/client/cl_cgame.o \ - $(B)/client/cl_cin.o \ - $(B)/client/cl_console.o \ - $(B)/client/cl_input.o \ - $(B)/client/cl_keys.o \ - $(B)/client/cl_main.o \ - $(B)/client/cl_net_chan.o \ - $(B)/client/cl_parse.o \ - $(B)/client/cl_scrn.o \ - $(B)/client/cl_ui.o \ - $(B)/client/cl_avi.o \ - \ - $(B)/client/cm_load.o \ - $(B)/client/cm_patch.o \ - $(B)/client/cm_polylib.o \ - $(B)/client/cm_test.o \ - $(B)/client/cm_trace.o \ - \ - $(B)/client/cmd.o \ - $(B)/client/common.o \ - $(B)/client/cvar.o \ - $(B)/client/files.o \ - $(B)/client/md4.o \ - $(B)/client/md5.o \ - $(B)/client/msg.o \ - $(B)/client/net_chan.o \ - $(B)/client/net_ip.o \ - $(B)/client/huffman.o \ - \ - $(B)/client/snd_adpcm.o \ - $(B)/client/snd_dma.o \ - $(B)/client/snd_mem.o \ - $(B)/client/snd_mix.o \ - $(B)/client/snd_wavelet.o \ - \ - $(B)/client/snd_main.o \ - $(B)/client/snd_codec.o \ - $(B)/client/snd_codec_wav.o \ - $(B)/client/snd_codec_ogg.o \ - \ - $(B)/client/qal.o \ - $(B)/client/snd_openal.o \ - \ - $(B)/client/cl_curl.o \ - \ - $(B)/client/sv_bot.o \ - $(B)/client/sv_ccmds.o \ - $(B)/client/sv_client.o \ - $(B)/client/sv_game.o \ - $(B)/client/sv_init.o \ - $(B)/client/sv_main.o \ - $(B)/client/sv_net_chan.o \ - $(B)/client/sv_snapshot.o \ - $(B)/client/sv_world.o \ - \ - $(B)/client/q_math.o \ - $(B)/client/q_shared.o \ - \ - $(B)/client/unzip.o \ - $(B)/client/puff.o \ - $(B)/client/vm.o \ - $(B)/client/vm_interpreted.o \ - \ - $(B)/client/be_aas_bspq3.o \ - $(B)/client/be_aas_cluster.o \ - $(B)/client/be_aas_debug.o \ - $(B)/client/be_aas_entity.o \ - $(B)/client/be_aas_file.o \ - $(B)/client/be_aas_main.o \ - $(B)/client/be_aas_move.o \ - $(B)/client/be_aas_optimize.o \ - $(B)/client/be_aas_reach.o \ - $(B)/client/be_aas_route.o \ - $(B)/client/be_aas_routealt.o \ - $(B)/client/be_aas_sample.o \ - $(B)/client/be_ai_char.o \ - $(B)/client/be_ai_chat.o \ - $(B)/client/be_ai_gen.o \ - $(B)/client/be_ai_goal.o \ - $(B)/client/be_ai_move.o \ - $(B)/client/be_ai_weap.o \ - $(B)/client/be_ai_weight.o \ - $(B)/client/be_ea.o \ - $(B)/client/be_interface.o \ - $(B)/client/l_crc.o \ - $(B)/client/l_libvar.o \ - $(B)/client/l_log.o \ - $(B)/client/l_memory.o \ - $(B)/client/l_precomp.o \ - $(B)/client/l_script.o \ - $(B)/client/l_struct.o \ - \ - $(B)/client/jcapimin.o \ - $(B)/client/jcapistd.o \ - $(B)/client/jccoefct.o \ - $(B)/client/jccolor.o \ - $(B)/client/jcdctmgr.o \ - $(B)/client/jchuff.o \ - $(B)/client/jcinit.o \ - $(B)/client/jcmainct.o \ - $(B)/client/jcmarker.o \ - $(B)/client/jcmaster.o \ - $(B)/client/jcomapi.o \ - $(B)/client/jcparam.o \ - $(B)/client/jcphuff.o \ - $(B)/client/jcprepct.o \ - $(B)/client/jcsample.o \ - $(B)/client/jdapimin.o \ - $(B)/client/jdapistd.o \ - $(B)/client/jdatasrc.o \ - $(B)/client/jdcoefct.o \ - $(B)/client/jdcolor.o \ - $(B)/client/jddctmgr.o \ - $(B)/client/jdhuff.o \ - $(B)/client/jdinput.o \ - $(B)/client/jdmainct.o \ - $(B)/client/jdmarker.o \ - $(B)/client/jdmaster.o \ - $(B)/client/jdpostct.o \ - $(B)/client/jdsample.o \ - $(B)/client/jdtrans.o \ - $(B)/client/jerror.o \ - $(B)/client/jfdctflt.o \ - $(B)/client/jidctflt.o \ - $(B)/client/jmemmgr.o \ - $(B)/client/jmemnobs.o \ - $(B)/client/jutils.o \ - \ - $(B)/client/tr_animation.o \ - $(B)/client/tr_backend.o \ - $(B)/client/tr_bsp.o \ - $(B)/client/tr_cmds.o \ - $(B)/client/tr_curve.o \ - $(B)/client/tr_flares.o \ - $(B)/client/tr_font.o \ - $(B)/client/tr_image.o \ - $(B)/client/tr_image_png.o \ - $(B)/client/tr_image_jpg.o \ - $(B)/client/tr_image_bmp.o \ - $(B)/client/tr_image_tga.o \ - $(B)/client/tr_image_pcx.o \ - $(B)/client/tr_init.o \ - $(B)/client/tr_light.o \ - $(B)/client/tr_main.o \ - $(B)/client/tr_marks.o \ - $(B)/client/tr_mesh.o \ - $(B)/client/tr_model.o \ - $(B)/client/tr_noise.o \ - $(B)/client/tr_scene.o \ - $(B)/client/tr_shade.o \ - $(B)/client/tr_shade_calc.o \ - $(B)/client/tr_shader.o \ - $(B)/client/tr_shadows.o \ - $(B)/client/tr_sky.o \ - $(B)/client/tr_surface.o \ - $(B)/client/tr_world.o \ - \ - $(B)/client/sdl_gamma.o \ - $(B)/client/sdl_input.o \ - $(B)/client/sdl_snd.o \ - \ - $(B)/client/con_passive.o \ - $(B)/client/con_log.o \ - $(B)/client/sys_main.o - -ifeq ($(ARCH),i386) - Q3OBJ += \ - $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ - $(B)/client/ftola.o \ - $(B)/client/snapvectora.o -endif -ifeq ($(ARCH),x86) - Q3OBJ += \ - $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ - $(B)/client/ftola.o \ - $(B)/client/snapvectora.o -endif - -ifeq ($(USE_VOIP),1) -ifeq ($(USE_INTERNAL_SPEEX),1) -Q3OBJ += \ - $(B)/client/bits.o \ - $(B)/client/buffer.o \ - $(B)/client/cb_search.o \ - $(B)/client/exc_10_16_table.o \ - $(B)/client/exc_10_32_table.o \ - $(B)/client/exc_20_32_table.o \ - $(B)/client/exc_5_256_table.o \ - $(B)/client/exc_5_64_table.o \ - $(B)/client/exc_8_128_table.o \ - $(B)/client/fftwrap.o \ - $(B)/client/filterbank.o \ - $(B)/client/filters.o \ - $(B)/client/gain_table.o \ - $(B)/client/gain_table_lbr.o \ - $(B)/client/hexc_10_32_table.o \ - $(B)/client/hexc_table.o \ - $(B)/client/high_lsp_tables.o \ - $(B)/client/jitter.o \ - $(B)/client/kiss_fft.o \ - $(B)/client/kiss_fftr.o \ - $(B)/client/lpc.o \ - $(B)/client/lsp.o \ - $(B)/client/lsp_tables_nb.o \ - $(B)/client/ltp.o \ - $(B)/client/mdf.o \ - $(B)/client/modes.o \ - $(B)/client/modes_wb.o \ - $(B)/client/nb_celp.o \ - $(B)/client/preprocess.o \ - $(B)/client/quant_lsp.o \ - $(B)/client/resample.o \ - $(B)/client/sb_celp.o \ - $(B)/client/smallft.o \ - $(B)/client/speex.o \ - $(B)/client/speex_callbacks.o \ - $(B)/client/speex_header.o \ - $(B)/client/stereo.o \ - $(B)/client/vbr.o \ - $(B)/client/vq.o \ - $(B)/client/window.o -endif -endif - - -ifeq ($(HAVE_VM_COMPILED),true) - ifeq ($(ARCH),i386) - Q3OBJ += $(B)/client/vm_x86.o - endif - ifeq ($(ARCH),x86) - Q3OBJ += $(B)/client/vm_x86.o - endif - ifeq ($(ARCH),x86_64) - Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o - endif - ifeq ($(ARCH),ppc) - Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o - endif - ifeq ($(ARCH),ppc64) - Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o - endif - ifeq ($(ARCH),sparc) - Q3OBJ += $(B)/client/vm_sparc.o - endif -endif - -ifeq ($(PLATFORM),mingw32) - Q3OBJ += \ - $(B)/client/win_resource.o \ - $(B)/client/sys_win32.o -else - Q3OBJ += \ - $(B)/client/sys_unix.o -endif - -ifeq ($(USE_MUMBLE),1) - Q3OBJ += \ - $(B)/client/libmumblelink.o -endif - -Q3POBJ += \ - $(B)/client/sdl_glimp.o - -Q3POBJ_SMP += \ - $(B)/clientsmp/sdl_glimp.o - -$(B)/ia.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" - $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \ - -o $@ $(Q3OBJ) $(Q3POBJ) \ - $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) - -$(B)/ia-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" - $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ - -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ - $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) - -ifneq ($(strip $(LIBSDLMAIN)),) -ifneq ($(strip $(LIBSDLMAINSRC)),) -$(LIBSDLMAIN) : $(LIBSDLMAINSRC) - cp $< $@ - ranlib $@ -endif -endif - - - -############################################################################# -# DEDICATED SERVER -############################################################################# - -Q3DOBJ = \ - $(B)/ded/sv_bot.o \ - $(B)/ded/sv_client.o \ - $(B)/ded/sv_ccmds.o \ - $(B)/ded/sv_game.o \ - $(B)/ded/sv_init.o \ - $(B)/ded/sv_main.o \ - $(B)/ded/sv_net_chan.o \ - $(B)/ded/sv_snapshot.o \ - $(B)/ded/sv_world.o \ - \ - $(B)/ded/cm_load.o \ - $(B)/ded/cm_patch.o \ - $(B)/ded/cm_polylib.o \ - $(B)/ded/cm_test.o \ - $(B)/ded/cm_trace.o \ - $(B)/ded/cmd.o \ - $(B)/ded/common.o \ - $(B)/ded/cvar.o \ - $(B)/ded/files.o \ - $(B)/ded/md4.o \ - $(B)/ded/msg.o \ - $(B)/ded/net_chan.o \ - $(B)/ded/net_ip.o \ - $(B)/ded/huffman.o \ - \ - $(B)/ded/q_math.o \ - $(B)/ded/q_shared.o \ - \ - $(B)/ded/unzip.o \ - $(B)/ded/vm.o \ - $(B)/ded/vm_interpreted.o \ - \ - $(B)/ded/be_aas_bspq3.o \ - $(B)/ded/be_aas_cluster.o \ - $(B)/ded/be_aas_debug.o \ - $(B)/ded/be_aas_entity.o \ - $(B)/ded/be_aas_file.o \ - $(B)/ded/be_aas_main.o \ - $(B)/ded/be_aas_move.o \ - $(B)/ded/be_aas_optimize.o \ - $(B)/ded/be_aas_reach.o \ - $(B)/ded/be_aas_route.o \ - $(B)/ded/be_aas_routealt.o \ - $(B)/ded/be_aas_sample.o \ - $(B)/ded/be_ai_char.o \ - $(B)/ded/be_ai_chat.o \ - $(B)/ded/be_ai_gen.o \ - $(B)/ded/be_ai_goal.o \ - $(B)/ded/be_ai_move.o \ - $(B)/ded/be_ai_weap.o \ - $(B)/ded/be_ai_weight.o \ - $(B)/ded/be_ea.o \ - $(B)/ded/be_interface.o \ - $(B)/ded/l_crc.o \ - $(B)/ded/l_libvar.o \ - $(B)/ded/l_log.o \ - $(B)/ded/l_memory.o \ - $(B)/ded/l_precomp.o \ - $(B)/ded/l_script.o \ - $(B)/ded/l_struct.o \ - \ - $(B)/ded/null_client.o \ - $(B)/ded/null_input.o \ - $(B)/ded/null_snddma.o \ - \ - $(B)/ded/con_log.o \ - $(B)/ded/sys_main.o - -ifeq ($(ARCH),i386) - Q3DOBJ += \ - $(B)/ded/ftola.o \ - $(B)/ded/snapvectora.o \ - $(B)/ded/matha.o -endif -ifeq ($(ARCH),x86) - Q3DOBJ += \ - $(B)/ded/ftola.o \ - $(B)/ded/snapvectora.o \ - $(B)/ded/matha.o -endif - -ifeq ($(HAVE_VM_COMPILED),true) - ifeq ($(ARCH),i386) - Q3DOBJ += $(B)/ded/vm_x86.o - endif - ifeq ($(ARCH),x86) - Q3DOBJ += $(B)/ded/vm_x86.o - endif - ifeq ($(ARCH),x86_64) - Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o - endif - ifeq ($(ARCH),ppc) - Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o - endif - ifeq ($(ARCH),ppc64) - Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o - endif - ifeq ($(ARCH),sparc) - Q3DOBJ += $(B)/ded/vm_sparc.o - endif -endif - -ifeq ($(PLATFORM),mingw32) - Q3DOBJ += \ - $(B)/ded/win_resource.o \ - $(B)/ded/sys_win32.o \ - $(B)/ded/con_win32.o -else - Q3DOBJ += \ - $(B)/ded/sys_unix.o \ - $(B)/ded/con_tty.o -endif - -$(B)/ia_ded.$(ARCH)$(BINEXT): $(Q3DOBJ) - $(echo_cmd) "LD $@" - $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS) - - - ############################################################################# ## BASEQ3 CGAME ############################################################################# @@ -1729,76 +1002,6 @@ $(B)/baseia/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM) $(echo_cmd) "Q3ASM $@" $(Q)$(Q3ASM) -o $@ $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm -############################################################################# -## CLIENT/SERVER RULES -############################################################################# - -$(B)/client/%.o: $(ASMDIR)/%.s - $(DO_AS) - -$(B)/client/%.o: $(CDIR)/%.c - $(DO_CC) - -$(B)/client/%.o: $(SDIR)/%.c - $(DO_CC) - -$(B)/client/%.o: $(CMDIR)/%.c - $(DO_CC) - -$(B)/client/%.o: $(BLIBDIR)/%.c - $(DO_BOT_CC) - -$(B)/client/%.o: $(JPDIR)/%.c - $(DO_CC) - -$(B)/client/%.o: $(SPEEXDIR)/%.c - $(DO_CC) - -$(B)/client/%.o: $(RDIR)/%.c - $(DO_CC) - -$(B)/client/%.o: $(SDLDIR)/%.c - $(DO_CC) - -$(B)/clientsmp/%.o: $(SDLDIR)/%.c - $(DO_SMP_CC) - -$(B)/client/%.o: $(SYSDIR)/%.c - $(DO_CC) - -$(B)/client/%.o: $(SYSDIR)/%.rc - $(DO_WINDRES) - - -$(B)/ded/%.o: $(ASMDIR)/%.s - $(DO_AS) - -$(B)/ded/%.o: $(SDIR)/%.c - $(DO_DED_CC) - -$(B)/ded/%.o: $(CMDIR)/%.c - $(DO_DED_CC) - -$(B)/ded/%.o: $(BLIBDIR)/%.c - $(DO_BOT_CC) - -$(B)/ded/%.o: $(SYSDIR)/%.c - $(DO_DED_CC) - -$(B)/ded/%.o: $(SYSDIR)/%.rc - $(DO_WINDRES) - -$(B)/ded/%.o: $(NDIR)/%.c - $(DO_DED_CC) - -# Extra dependencies to ensure the SVN version is incorporated -ifeq ($(USE_SVN),1) - $(B)/client/cl_console.o : .svn/entries - $(B)/client/common.o : .svn/entries - $(B)/ded/common.o : .svn/entries -endif - - ############################################################################# ## GAME MODULE RULES ############################################################################# @@ -1844,7 +1047,7 @@ $(B)/baseia/qcommon/%.asm: $(CMDIR)/%.c $(Q3LCC) ############################################################################# $(B)/baseia/productid.txt: $(echo_cmd) "GEN $@" - @echo "Illusion Arena $(shell svn info --show-item revision)" > $@ + @echo "Illusion Arena $(shell git rev-list --all | wc -l)" > $@ $(B)/baseia/pak1.pk3: $(B)/baseia/productid.txt $(B)/baseia/vm/cgame.qvm $(B)/baseia/vm/qagame.qvm $(B)/baseia/vm/ui.qvm $(echo_cmd) "ZIP $@" @cd $(B)/baseia && zip -9r $(notdir $@) productid.txt vm @@ -1863,21 +1066,6 @@ copyfiles: release @if [ ! -d $(COPYDIR)/code ]; then echo "You need to set COPYDIR to where your I::A data is!"; fi -$(MKDIR) -p -m 0755 $(COPYDIR)/code -ifneq ($(BUILD_CLIENT),0) - $(INSTALL) -s -m 0755 $(BR)/ia.$(ARCH)$(BINEXT) $(COPYDIR)/ia.$(ARCH)$(BINEXT) -endif - -# Don't copy the SMP until it's working together with SDL. -#ifneq ($(BUILD_CLIENT_SMP),0) -# $(INSTALL) -s -m 0755 $(BR)/ioquake3-smp.$(ARCH)$(BINEXT) $(COPYDIR)/ioquake3-smp.$(ARCH)$(BINEXT) -#endif - -ifneq ($(BUILD_SERVER),0) - @if [ -f $(BR)/ia_ded.$(ARCH)$(BINEXT) ]; then \ - $(INSTALL) -s -m 0755 $(BR)/ia_ded.$(ARCH)$(BINEXT) $(COPYDIR)/ia_ded.$(ARCH)$(BINEXT); \ - fi -endif - ifneq ($(BUILD_GAME_SO),0) $(INSTALL) -s -m 0755 $(BR)/baseia/cgame$(ARCH).$(SHLIBEXT) \ $(COPYDIR)/baseia/. @@ -1889,13 +1077,6 @@ endif clean: clean-debug clean-release -#We do not make installers -#ifeq ($(PLATFORM),mingw32) -# @$(MAKE) -C $(NSISDIR) clean -#else -# @$(MAKE) -C $(LOKISETUPDIR) clean -#endif - clean-debug: @$(MAKE) clean2 B=$(BD) @@ -1925,13 +1106,6 @@ toolsclean2: distclean: clean toolsclean @rm -rf $(BUILD_DIR) -installer: release -ifeq ($(PLATFORM),mingw32) - @$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) -else - @$(MAKE) VERSION=$(VERSION) -C $(LOKISETUPDIR) V=$(V) -endif - dist: rm -rf ia-$(VERSION) svn export . ia-$(VERSION) diff --git a/linux_scripts/supermake b/linux_scripts/supermake deleted file mode 100755 index dcfb72e..0000000 --- a/linux_scripts/supermake +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -#Tip: You can create a supermake.local file and this script will get the variable from there! -BINNAME=illusion-arena -MODNAME=baseia -#ARCH should be either i386 (32 bit) or x86_64 (64 bit) -ARCH=i386 - -if [ -r ./supermake.local ] ; then -source ./supermake.local -fi - -if [ -r $BINNAME ] ; then - echo $BINNAME found -else - echo $BINNAME not found! Check the variables in the script - exit 1 -fi - -#Create the mod dir -mkdir -p ~/.illusion/$MODNAME - - -pushd .. -#Build, pak it and start -make && cd build/release-linux-$ARCH/baseq3 && zip -r ~/.illusion/$MODNAME/$MODNAME.pk3 vm && $BINNAME +set fs_game $MODNAME +set debug 1 +set sv_pure 0 +vm_ui 2 +vm_game 2 +vm_cgame 2 -popd - diff --git a/linux_scripts/supermake_native b/linux_scripts/supermake_native deleted file mode 100755 index fcd0fa7..0000000 --- a/linux_scripts/supermake_native +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -#Tip: You can create a supermake.local file and this script will get the variable from there! -BINNAME=illusion-arena -MODNAME=baseia -#ARCH should be either i386 (32 bit) or x86_64 (64 bit) -ARCH=i386 - -if [ -r ./supermake.local ] ; then -source ./supermake.local -fi - -if [ -r $BINNAME ] ; then - echo $BINNAME found -else - echo $BINNAME not found! Check the variables in the script - exit 1 -fi - -#Create the mod dir -mkdir -p ~/.illusion/$MODNAME - -pushd .. -#Build, pak it and start -make && cd build/release-linux-$ARCH/baseia && cp *.so ~/.illusion/$MODNAME/ && $BINNAME +set fs_game $MODNAME +set debug 1 +set sv_pure 0 +vm_ui 0 +vm_game 0 +vm_cgame 0 -popd - diff --git a/windows_scripts/cgame.q3asm b/windows_scripts/cgame.q3asm deleted file mode 100644 index 9414523..0000000 --- a/windows_scripts/cgame.q3asm +++ /dev/null @@ -1,28 +0,0 @@ --o "../../baseoa/vm/cgame" -cg_main -..\cg_syscalls -cg_challenges -cg_consolecmds -cg_draw -cg_drawtools -cg_effects -cg_ents -cg_event -cg_info -cg_localents -cg_marks -cg_players -cg_playerstate -cg_predict -cg_scoreboard -cg_servercmds -cg_snapshot -cg_unlagged -cg_view -cg_weapons -bg_slidemove -bg_pmove -bg_lib -bg_misc -q_math -q_shared diff --git a/windows_scripts/cgame_mp.q3asm b/windows_scripts/cgame_mp.q3asm deleted file mode 100644 index 5d1d677..0000000 --- a/windows_scripts/cgame_mp.q3asm +++ /dev/null @@ -1,30 +0,0 @@ --o "../../missionpack/vm/cgame" -cg_main -..\cg_syscalls -cg_challenges -cg_consolecmds -cg_newdraw -cg_draw -cg_drawtools -cg_effects -cg_ents -cg_event -cg_info -cg_localents -cg_marks -cg_players -cg_playerstate -cg_predict -cg_scoreboard -cg_servercmds -cg_snapshot -cg_unlagged -cg_view -cg_weapons -bg_slidemove -bg_pmove -bg_lib -bg_misc -q_math -q_shared -ui_shared diff --git a/windows_scripts/game.q3asm b/windows_scripts/game.q3asm deleted file mode 100644 index 7566aac..0000000 --- a/windows_scripts/game.q3asm +++ /dev/null @@ -1,43 +0,0 @@ --o "../../baseoa/vm/qagame.qvm" -g_main -..\g_syscalls -bg_misc -bg_lib -bg_pmove -bg_slidemove -q_math -q_shared -ai_dmnet -ai_dmq3 -ai_team -ai_main -ai_chat -ai_cmd -ai_vcmd -g_active -g_admin -g_arenas -g_bot -g_client -g_cmds -g_cmds_ext -g_combat -g_items -bg_alloc -g_fileops -g_killspree -g_misc -g_missile -g_mover -g_playerstore -g_session -g_spawn -g_svcmds -g_svcmds_ext -g_target -g_team -g_trigger -g_unlagged -g_utils -g_vote -g_weapon diff --git a/windows_scripts/game_mp.q3asm b/windows_scripts/game_mp.q3asm deleted file mode 100644 index 89a13c3..0000000 --- a/windows_scripts/game_mp.q3asm +++ /dev/null @@ -1,43 +0,0 @@ --o "../../missionpack/vm/qagame.qvm" -g_main -..\g_syscalls -bg_misc -bg_lib -bg_pmove -bg_slidemove -q_math -q_shared -ai_dmnet -ai_dmq3 -ai_team -ai_main -ai_chat -ai_cmd -ai_vcmd -g_active -g_admin -g_arenas -g_bot -g_client -g_cmds -g_cmds_ext -g_combat -g_items -bg_alloc -g_fileops -g_killspree -g_misc -g_missile -g_mover -g_playerstore -g_session -g_spawn -g_svcmds -g_svcmds_ext -g_target -g_team -g_trigger -g_unlagged -g_utils -g_vote -g_weapon diff --git a/windows_scripts/q3_ui.q3asm b/windows_scripts/q3_ui.q3asm deleted file mode 100644 index dc16073..0000000 --- a/windows_scripts/q3_ui.q3asm +++ /dev/null @@ -1,53 +0,0 @@ --o "../../baseoa/vm/ui" -ui_main -..\ui_syscalls -ui_gameinfo -ui_atoms -ui_cinematics -ui_connect -ui_controls2 -ui_challenges -ui_demo2 -ui_mfield -ui_credits -ui_menu -ui_ingame -ui_confirm -ui_setup -ui_options -ui_display -ui_firstconnect -ui_sound -ui_network -ui_password -ui_playermodel -ui_players -ui_playersettings -ui_preferences -ui_qmenu -ui_serverinfo -ui_servers2 -ui_sparena -ui_specifyserver -ui_sppostgame -ui_splevel -ui_spskill -ui_startserver -ui_team -ui_video -ui_addbots -ui_removebots -ui_teamorders -ui_cdkey -ui_mods -ui_votemenu -ui_votemenu_custom -ui_votemenu_gametype -ui_votemenu_fraglimit -ui_votemenu_kick -ui_votemenu_map -ui_votemenu_timelimit -bg_misc -bg_lib -q_math -q_shared diff --git a/windows_scripts/ui.q3asm b/windows_scripts/ui.q3asm deleted file mode 100644 index 021efaf..0000000 --- a/windows_scripts/ui.q3asm +++ /dev/null @@ -1,11 +0,0 @@ --o "../../missionpack/vm/ui" -ui_main -..\ui_syscalls -ui_gameinfo -ui_atoms -ui_players -ui_shared -bg_misc -bg_lib -q_math -q_shared diff --git a/windows_scripts/windows_compile_cgame.bat b/windows_scripts/windows_compile_cgame.bat deleted file mode 100644 index 05d1f86..0000000 --- a/windows_scripts/windows_compile_cgame.bat +++ /dev/null @@ -1,56 +0,0 @@ -cd .. -mkdir windows -mkdir windows\build -mkdir windows\baseoa -mkdir windows\baseoa\vm -mkdir windows\build\cgame -copy windows_scripts\lcc.exe windows\build\cgame\ -copy windows_scripts\q3cpp.exe windows\build\cgame\ -copy windows_scripts\q3rcc.exe windows\build\cgame\ -copy windows_scripts\q3asm.exe windows\build\cgame\ -copy windows_scripts\cgame.q3asm windows\build\ - -set LIBRARY= -set INCLUDE= - -set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\..\code\cgame -I..\..\..\code\qcommon %1 - -cd windows\build\cgame - -%cc% ../../../code/cgame/cg_challenges.c -%cc% ../../../code/cgame/cg_consolecmds.c -%cc% ../../../code/cgame/cg_draw.c -%cc% ../../../code/cgame/cg_drawtools.c -%cc% ../../../code/cgame/cg_effects.c -%cc% ../../../code/cgame/cg_ents.c -%cc% ../../../code/cgame/cg_event.c -%cc% ../../../code/cgame/cg_info.c -%cc% ../../../code/cgame/cg_localents.c -%cc% ../../../code/cgame/cg_main.c -%cc% ../../../code/cgame/cg_marks.c -%cc% ../../../code/cgame/cg_newdraw.c -%cc% ../../../code/cgame/cg_particles.c -%cc% ../../../code/cgame/cg_players.c -%cc% ../../../code/cgame/cg_playerstate.c -%cc% ../../../code/cgame/cg_predict.c -%cc% ../../../code/cgame/cg_scoreboard.c -%cc% ../../../code/cgame/cg_servercmds.c -%cc% ../../../code/cgame/cg_snapshot.c -%cc% ../../../code/cgame/cg_unlagged.c -%cc% ../../../code/cgame/cg_view.c -%cc% ../../../code/cgame/cg_weapons.c - -%cc% ../../../code/game/bg_lib.c -%cc% ../../../code/game/bg_misc.c -%cc% ../../../code/game/bg_pmove.c -%cc% ../../../code/game/bg_slidemove.c - -copy ..\..\..\code\cgame\cg_syscalls.asm .. - -%cc% ../../../code/qcommon/q_math.c -%cc% ../../../code/qcommon/q_shared.c - -q3asm -f ../cgame - -cd ..\..\.. -pause diff --git a/windows_scripts/windows_compile_game.bat b/windows_scripts/windows_compile_game.bat deleted file mode 100644 index 83d785c..0000000 --- a/windows_scripts/windows_compile_game.bat +++ /dev/null @@ -1,69 +0,0 @@ -cd .. -mkdir windows -mkdir windows\build -mkdir windows\baseoa -mkdir windows\baseoa\vm -mkdir windows\build\game -copy windows_scripts\lcc.exe windows\build\game\ -copy windows_scripts\q3cpp.exe windows\build\game\ -copy windows_scripts\q3rcc.exe windows\build\game\ -copy windows_scripts\q3asm.exe windows\build\game\ -copy windows_scripts\game.q3asm windows\build\ - -set LIBRARY= -set INCLUDE= - -set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\..\code\game -I..\..\..\code\qcommon %1 - -cd windows\build\game - -%cc% ../../../code/game/ai_chat.c -%cc% ../../../code/game/ai_cmd.c -%cc% ../../../code/game/ai_dmnet.c -%cc% ../../../code/game/ai_dmq3.c -%cc% ../../../code/game/ai_main.c -%cc% ../../../code/game/ai_team.c -%cc% ../../../code/game/ai_vcmd.c -%cc% ../../../code/game/bg_lib.c -%cc% ../../../code/game/bg_misc.c -%cc% ../../../code/game/bg_pmove.c -%cc% ../../../code/game/bg_slidemove.c -%cc% ../../../code/game/g_active.c -%cc% ../../../code/game/g_admin.c -%cc% ../../../code/game/g_arenas.c -%cc% ../../../code/game/g_bot.c -%cc% ../../../code/game/g_client.c -%cc% ../../../code/game/g_cmds.c -%cc% ../../../code/game/g_cmds_ext.c -%cc% ../../../code/game/g_combat.c -%cc% ../../../code/game/g_items.c -%cc% ../../../code/game/g_main.c -%cc% ../../../code/game/bg_alloc.c -%cc% ../../../code/game/g_fileops.c -%cc% ../../../code/game/g_killspree.c -%cc% ../../../code/game/g_misc.c -%cc% ../../../code/game/g_missile.c -%cc% ../../../code/game/g_mover.c -%cc% ../../../code/game/g_playerstore.c -rem %cc% ../../../code/game/g_rankings.c -%cc% ../../../code/game/g_session.c -%cc% ../../../code/game/g_spawn.c -%cc% ../../../code/game/g_svcmds.c -%cc% ../../../code/game/g_svcmds_ext.c -rem %cc% ../../../code/game/g_syscalls.c -copy ..\..\..\code\game\g_syscalls.asm .. -%cc% ../../../code/game/g_target.c -%cc% ../../../code/game/g_team.c -%cc% ../../../code/game/g_trigger.c -%cc% ../../../code/game/g_unlagged.c -%cc% ../../../code/game/g_utils.c -%cc% ../../../code/game/g_vote.c -%cc% ../../../code/game/g_weapon.c - -%cc% ../../../code/qcommon/q_math.c -%cc% ../../../code/qcommon/q_shared.c - -q3asm -f ../game - -cd ..\..\.. -pause diff --git a/windows_scripts/windows_compile_q3_ui.bat b/windows_scripts/windows_compile_q3_ui.bat deleted file mode 100644 index 0119d42..0000000 --- a/windows_scripts/windows_compile_q3_ui.bat +++ /dev/null @@ -1,87 +0,0 @@ -cd .. -mkdir windows -mkdir windows\build -mkdir windows\baseoa -mkdir windows\baseoa\vm -mkdir windows\build\q3_ui -copy windows_scripts\lcc.exe windows\build\q3_ui\ -copy windows_scripts\q3cpp.exe windows\build\q3_ui\ -copy windows_scripts\q3rcc.exe windows\build\q3_ui\ -copy windows_scripts\q3asm.exe windows\build\q3_ui\ -copy windows_scripts\q3_ui.q3asm windows\build\ - -set LIBRARY= -set INCLUDE= - -set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\..\code\q3_ui -I..\..\..\code\qcommon %1 - -cd windows\build\q3_ui - -%cc% ../../../code/q3_ui/ui_addbots.c -%cc% ../../../code/q3_ui/ui_atoms.c -%cc% ../../../code/q3_ui/ui_cdkey.c -%cc% ../../../code/q3_ui/ui_challenges.c -%cc% ../../../code/q3_ui/ui_cinematics.c -%cc% ../../../code/q3_ui/ui_confirm.c -%cc% ../../../code/q3_ui/ui_connect.c -%cc% ../../../code/q3_ui/ui_controls2.c -%cc% ../../../code/q3_ui/ui_credits.c -%cc% ../../../code/q3_ui/ui_demo2.c -%cc% ../../../code/q3_ui/ui_display.c -%cc% ../../../code/q3_ui/ui_firstconnect.c -%cc% ../../../code/q3_ui/ui_gameinfo.c -%cc% ../../../code/q3_ui/ui_ingame.c -%cc% ../../../code/q3_ui/ui_loadconfig.c -%cc% ../../../code/q3_ui/ui_login.c -%cc% ../../../code/q3_ui/ui_main.c -%cc% ../../../code/q3_ui/ui_menu.c -%cc% ../../../code/q3_ui/ui_mfield.c -%cc% ../../../code/q3_ui/ui_mods.c -%cc% ../../../code/q3_ui/ui_network.c -%cc% ../../../code/q3_ui/ui_options.c -%cc% ../../../code/q3_ui/ui_password.c -%cc% ../../../code/q3_ui/ui_playermodel.c -%cc% ../../../code/q3_ui/ui_players.c -%cc% ../../../code/q3_ui/ui_playersettings.c -%cc% ../../../code/q3_ui/ui_preferences.c -%cc% ../../../code/q3_ui/ui_qmenu.c -%cc% ../../../code/q3_ui/ui_rankings.c -%cc% ../../../code/q3_ui/ui_rankstatus.c -%cc% ../../../code/q3_ui/ui_removebots.c -%cc% ../../../code/q3_ui/ui_saveconfig.c -%cc% ../../../code/q3_ui/ui_serverinfo.c -%cc% ../../../code/q3_ui/ui_servers2.c -%cc% ../../../code/q3_ui/ui_setup.c -rem %cc% ../../../code/q3_ui/ui_signup.c -%cc% ../../../code/q3_ui/ui_sound.c -%cc% ../../../code/q3_ui/ui_sparena.c -%cc% ../../../code/q3_ui/ui_specifyleague.c -%cc% ../../../code/q3_ui/ui_specifyserver.c -%cc% ../../../code/q3_ui/ui_splevel.c -%cc% ../../../code/q3_ui/ui_sppostgame.c -%cc% ../../../code/q3_ui/ui_spreset.c -%cc% ../../../code/q3_ui/ui_spskill.c -%cc% ../../../code/q3_ui/ui_startserver.c -%cc% ../../../code/q3_ui/ui_team.c -%cc% ../../../code/q3_ui/ui_teamorders.c -%cc% ../../../code/q3_ui/ui_video.c -%cc% ../../../code/q3_ui/ui_votemenu.c -%cc% ../../../code/q3_ui/ui_votemenu_fraglimit.c -%cc% ../../../code/q3_ui/ui_votemenu_custom.c -%cc% ../../../code/q3_ui/ui_votemenu_gametype.c -%cc% ../../../code/q3_ui/ui_votemenu_kick.c -%cc% ../../../code/q3_ui/ui_votemenu_map.c -%cc% ../../../code/q3_ui/ui_votemenu_timelimit.c - -copy ..\..\..\code\ui\ui_syscalls.asm .. - -%cc% ../../../code/game/bg_lib.c -%cc% ../../../code/game/bg_misc.c - -%cc% ../../../code/qcommon/q_math.c -%cc% ../../../code/qcommon/q_shared.c - -q3asm -f ../q3_ui - -cd ..\..\.. -pause diff --git a/windows_scripts/windows_compile_readme.txt b/windows_scripts/windows_compile_readme.txt deleted file mode 100644 index 01fdf1c..0000000 --- a/windows_scripts/windows_compile_readme.txt +++ /dev/null @@ -1,22 +0,0 @@ -2009-04-27 Sago007 - -You can now compile the OpenArena mod SDK in Windows! - -use the batch files for baseoa: -windows_compile_game.bat -windows_compile_cgame.bat -windows_compile_q3_ui.bat - -The qvm files will be placed in: -windows\baseia\vm - -The batch files has no error checking so you need to read the output. Feel free to improve the scripts. - -The binary blobs: -lcc.exe -q3cpp.exe -q3rpp.exe -q3asm.exe - -id software provided both the source and precompiled binaries so I guess they knew how hard these files are to compile. If you succed in compiling them please tell how. I would really apreciate if anyone can get ioquake3's improved qvm tools compiled as those provided here has some bugs. -