From 6b229861a1ece926b46919a2651129fd4789c13c Mon Sep 17 00:00:00 2001 From: Roy Shapiro <70241434+RoyShapiro@users.noreply.github.com> Date: Fri, 8 Jul 2022 17:20:39 +0300 Subject: [PATCH] HL:Invasion Attempt to ammend build system scripts other than cmake --- CMakeLists.txt | 8 +- cl_dll/Android.mk | 47 ++++---- cl_dll/compile.bat | 39 +++---- cl_dll/wscript | 39 ++++--- contrib/iZarif/premake5.lua | 78 +++++++++---- dlls/Android.mk | 223 +++++++++++++++++++----------------- dlls/compile.bat | 35 ++++-- dlls/wscript | 75 +++++++----- 8 files changed, 317 insertions(+), 227 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 489b84de..36fc55a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ # # Copyright (c) 2016 Alibek Omarov # +# Edited by Roy for HL:Invasion +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights @@ -38,7 +40,7 @@ project (HLSDK-XASH3D) #-------------- # USER DEFINES \ ################\ -option(USE_VGUI "Enable VGUI1." OFF) +option(USE_VGUI "Enable VGUI1." ON) option(USE_VGUI2 "Enable VGUI2. UNDONE" OFF) option(USE_NOVGUI_MOTD "Prefer non-VGUI MOTD when USE_VGUI is enabled" OFF) option(USE_NOVGUI_SCOREBOARD "Prefer non-VGUI Scoreboard when USE_VGUI is enabled" OFF) @@ -46,6 +48,8 @@ option(USE_VOICEMGR "Enable VOICE MANAGER." OFF) option(BUILD_CLIENT "Build client dll" ON) option(BUILD_SERVER "Build server dll" ON) option(GOLDSOURCE_SUPPORT "Build goldsource compatible client library" OFF) +option(USE_GSTREAMER "Enable GStreamer." OFF) +option(USE_FMOD "Enable FMOD." OFF) if (CMAKE_SIZEOF_VOID_P EQUAL 4 OR ((WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux") @@ -69,7 +73,7 @@ option(HLDEMO_BUILD "Enable Demo Build" OFF) set(GAMEDIR "valve" CACHE STRING "Gamedir path") set(SERVER_INSTALL_DIR "dlls" CACHE STRING "Where put server dll") set(CLIENT_INSTALL_DIR "cl_dlls" CACHE STRING "Where put client dll") -set(SERVER_LIBRARY_NAME "hl" CACHE STRING "Library name for PC platforms") +set(SERVER_LIBRARY_NAME "invasion" CACHE STRING "Library name for PC platforms") message(STATUS "Half-Life") #----------------- diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk index df6130ed..1f45cf85 100755 --- a/cl_dll/Android.mk +++ b/cl_dll/Android.mk @@ -1,5 +1,8 @@ #hlsdk-2.3 client port for android #Copyright (c) mittorn +#Edited by Roy for HL:Invasion +#Warning: Completely UNTESTED! +#Warning: Won't work properly as this mod requires TRUE VGUI! (If you can edit it in - you're more than welcome!) LOCAL_PATH := $(call my-dir) @@ -24,27 +27,25 @@ LOCAL_CFLAGS += -DCLIENT_DLL=1 SRCS= SRCS_C= -SRCS+=../dlls/crossbow.cpp -SRCS+=../dlls/crowbar.cpp -SRCS+=../dlls/egon.cpp +SRCS+=./clientbriquet.cpp +SRCS+=./clientfog.cpp +SRCS+=./clientlflammes.cpp SRCS+=./ev_hldm.cpp -SRCS+=../dlls/gauss.cpp -SRCS+=../dlls/handgrenade.cpp +SRCS+=./GameStudioModelRenderer.cpp SRCS+=./hl/hl_baseentity.cpp SRCS+=./hl/hl_events.cpp SRCS+=./hl/hl_objects.cpp SRCS+=./hl/hl_weapons.cpp -SRCS+=../dlls/hornetgun.cpp -SRCS+=../dlls/mp5.cpp -SRCS+=../dlls/python.cpp -SRCS+=../dlls/rpg.cpp -SRCS+=../dlls/satchel.cpp -SRCS+=../dlls/shotgun.cpp -SRCS+=../dlls/squeakgrenade.cpp -SRCS+=../dlls/tripmine.cpp SRCS+=../dlls/glock.cpp -#SRCS+=../game_shared/voice_banmgr.cpp -#SRCS+=../game_shared/voice_status.cpp +SRCS+=./hud_tank.cpp +SRCS+=./hudradio.cpp +SRCS+=./hudrpg.cpp +SRCS+=./hudzoom.cpp +SRCS+=./lensflare.cpp +SRCS+=./nvg.cpp +SRCS+=./particules.cpp +SRCS+=./studio_util.cpp +SRCS+=./StudioModelRenderer.cpp SRCS+=./ammo.cpp SRCS+=./ammo_secondary.cpp SRCS+=./ammohistory.cpp @@ -57,40 +58,34 @@ SRCS+=./entity.cpp SRCS+=./ev_common.cpp SRCS+=./events.cpp SRCS+=./flashlight.cpp -SRCS+=./GameStudioModelRenderer.cpp SRCS+=./geiger.cpp SRCS+=./health.cpp SRCS+=./hud.cpp SRCS+=./hud_msg.cpp SRCS+=./hud_redraw.cpp -#SRCS+=./hud_servers.cpp SRCS+=./hud_spectator.cpp SRCS+=./hud_update.cpp SRCS+=./in_camera.cpp SRCS+=./input.cpp SRCS+=./input_goldsource.cpp SRCS+=./input_mouse.cpp -#SRCS+=./inputw32.cpp +SRCS+=./input_xash3d.cpp SRCS+=./menu.cpp SRCS+=./message.cpp SRCS+=./overview.cpp SRCS+=./parsemsg.cpp -SRCS_C+=../pm_shared/pm_debug.c -SRCS_C+=../pm_shared/pm_math.c -SRCS_C+=../pm_shared/pm_shared.c +SRCS+=./parsemsg.h +SRCS_C+=./../pm_shared/pm_debug.c +SRCS_C+=./../pm_shared/pm_math.c +SRCS_C+=./../pm_shared/pm_shared.c SRCS+=./saytext.cpp SRCS+=./status_icons.cpp SRCS+=./statusbar.cpp -SRCS+=./studio_util.cpp -SRCS+=./StudioModelRenderer.cpp SRCS+=./text_message.cpp SRCS+=./train.cpp SRCS+=./tri.cpp SRCS+=./util.cpp SRCS+=./view.cpp -SRCS+=./input_xash3d.cpp -SRCS+=./scoreboard.cpp -SRCS+=./MOTD.cpp INCLUDES = -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls -I../utils/false_vgui/include DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w -D_snprintf=snprintf diff --git a/cl_dll/compile.bat b/cl_dll/compile.bat index 18b45459..37f33ed4 100644 --- a/cl_dll/compile.bat +++ b/cl_dll/compile.bat @@ -1,4 +1,7 @@ @echo off +@rem "Edited by Roy for HL:Invasion" +@rem "Warning: Completely UNTESTED!" +@rem "Warning: Won't work properly as this mod requires TRUE VGUI! (If you can edit it in - you're more than welcome!)" echo Setting environment for minimal Visual C++ 6 set INCLUDE=%MSVCDir%\VC98\Include set LIB=%MSVCDir%\VC98\Lib @@ -8,25 +11,25 @@ echo -- Compiler is MSVC6 set XASH3DSRC=..\..\Xash3D_original set INCLUDES=-I../common -I../engine -I../pm_shared -I../game_shared -I../public -I../external -I../dlls -I../utils/false_vgui/include -set SOURCES=../dlls/crossbow.cpp ^ - ../dlls/crowbar.cpp ^ - ../dlls/egon.cpp ^ - ../dlls/gauss.cpp ^ - ../dlls/handgrenade.cpp ^ - ../dlls/hornetgun.cpp ^ - ../dlls/mp5.cpp ^ - ../dlls/python.cpp ^ - ../dlls/rpg.cpp ^ - ../dlls/satchel.cpp ^ - ../dlls/shotgun.cpp ^ - ../dlls/squeakgrenade.cpp ^ - ../dlls/tripmine.cpp ^ - ../dlls/glock.cpp ^ +set SOURCES=clientbriquet.cpp ^ + clientfog.cpp ^ + clientlflammes.cpp ^ ev_hldm.cpp ^ + GameStudioModelRenderer.cpp ^ hl/hl_baseentity.cpp ^ hl/hl_events.cpp ^ hl/hl_objects.cpp ^ hl/hl_weapons.cpp ^ + ../dlls/glock.cpp ^ + hud_tank.cpp ^ + hudradio.cpp ^ + hudrpg.cpp ^ + hudzoom.cpp ^ + lensflare.cpp ^ + nvg.cpp ^ + particules.cpp ^ + studio_util.cpp ^ + StudioModelRenderer.cpp ^ ammo.cpp ^ ammo_secondary.cpp ^ ammohistory.cpp ^ @@ -39,7 +42,6 @@ set SOURCES=../dlls/crossbow.cpp ^ ev_common.cpp ^ events.cpp ^ flashlight.cpp ^ - GameStudioModelRenderer.cpp ^ geiger.cpp ^ health.cpp ^ hud.cpp ^ @@ -56,21 +58,18 @@ set SOURCES=../dlls/crossbow.cpp ^ message.cpp ^ overview.cpp ^ parsemsg.cpp ^ + parsemsg.h ^ ../pm_shared/pm_debug.c ^ ../pm_shared/pm_math.c ^ ../pm_shared/pm_shared.c ^ saytext.cpp ^ status_icons.cpp ^ statusbar.cpp ^ - studio_util.cpp ^ - StudioModelRenderer.cpp ^ text_message.cpp ^ train.cpp ^ tri.cpp ^ util.cpp ^ - view.cpp ^ - scoreboard.cpp ^ - MOTD.cpp + view.cpp set DEFINES=/DCLIENT_DLL /DCLIENT_WEAPONS /Dsnprintf=_snprintf /DNO_VOICEGAMEMGR /DGOLDSOURCE_SUPPORT set LIBS=user32.lib Winmm.lib set OUTNAME=client.dll diff --git a/cl_dll/wscript b/cl_dll/wscript index 07dabf08..4103ed79 100644 --- a/cl_dll/wscript +++ b/cl_dll/wscript @@ -1,6 +1,9 @@ #! /usr/bin/env python # encoding: utf-8 # a1batross, mittorn, 2018 +# Edited by Roy for HL:Invasion +# Warning: Completely UNTESTED! +# Warning: Won't work properly as this mod requires TRUE VGUI! (If you can edit it in - you're more than welcome!) from waflib import Utils import os @@ -27,24 +30,26 @@ def build(bld): 'hl/*.cpp' ]) source += bld.path.parent.ant_glob([ - 'dlls/crossbow.cpp', - 'dlls/crowbar.cpp', - 'dlls/egon.cpp', - 'dlls/gauss.cpp', - 'dlls/glock.cpp', - 'dlls/handgrenade.cpp', - 'dlls/hornetgun.cpp', - 'dlls/mp5.cpp', - 'dlls/python.cpp', - 'dlls/rpg.cpp', - 'dlls/satchel.cpp', - 'dlls/shotgun.cpp', - 'dlls/squeakgrenade.cpp', - 'dlls/tripmine.cpp' + 'dlls/glock.cpp' ]) source += [ + 'clientbriquet.cpp', + 'clientfog.cpp', + 'clientlflammes.cpp', + 'ev_hldm.cpp', 'GameStudioModelRenderer.cpp', - 'MOTD.cpp', + 'hl/hl_baseentity.cpp', + 'hl/hl_events.cpp', + 'hl/hl_objects.cpp', + 'hl/hl_weapons.cpp', + 'hud_tank.cpp', + 'hudradio.cpp', + 'hudrpg.cpp', + 'hudzoom.cpp', + 'lensflare.cpp', + 'nvg.cpp', + 'particules.cpp', + 'studio_util.cpp', 'StudioModelRenderer.cpp', 'ammo.cpp', 'ammo_secondary.cpp', @@ -55,7 +60,6 @@ def build(bld): 'death.cpp', 'demo.cpp', 'entity.cpp', - 'ev_hldm.cpp', 'ev_common.cpp', 'events.cpp', 'flashlight.cpp', @@ -75,11 +79,10 @@ def build(bld): 'message.cpp', 'overview.cpp', 'parsemsg.cpp', + 'parsemsg.h', 'saytext.cpp', - 'scoreboard.cpp', 'status_icons.cpp', 'statusbar.cpp', - 'studio_util.cpp', 'text_message.cpp', 'train.cpp', 'tri.cpp', diff --git a/contrib/iZarif/premake5.lua b/contrib/iZarif/premake5.lua index 91817da5..2acf5e78 100644 --- a/contrib/iZarif/premake5.lua +++ b/contrib/iZarif/premake5.lua @@ -12,20 +12,7 @@ targetprefix("") files{"pm_shared/pm_debug.c", "pm_shared/pm_math.c", "pm_shared/pm_shared.c", -"dlls/crossbow.cpp", -"dlls/crowbar.cpp", -"dlls/egon.cpp", -"dlls/gauss.cpp", -"dlls/glock.cpp", -"dlls/handgrenade.cpp", -"dlls/hornetgun.cpp", -"dlls/mp5.cpp", -"dlls/python.cpp", -"dlls/rpg.cpp", -"dlls/satchel.cpp", -"dlls/shotgun.cpp", -"dlls/squeakgrenade.cpp", -"dlls/tripmine.cpp"} +"dlls/glock.cpp"} includedirs{"dlls", "common", @@ -138,9 +125,9 @@ defines{"stricmp=strcasecmp", project("dlls") targetname("hl") -files{"dlls/agrunt.cpp", +files{"dlls/aflock.cpp", +"dlls/agrunt.cpp", "dlls/airtank.cpp", -"dlls/aflock.cpp", "dlls/animating.cpp", "dlls/animation.cpp", "dlls/apache.cpp", @@ -149,22 +136,31 @@ files{"dlls/agrunt.cpp", "dlls/bigmomma.cpp", "dlls/bloater.cpp", "dlls/bmodels.cpp", +"dlls/briquet.cpp", "dlls/bullsquid.cpp", "dlls/buttons.cpp", "dlls/cbase.cpp", "dlls/client.cpp", "dlls/combat.cpp", "dlls/controller.cpp", +"dlls/crowbar.cpp", "dlls/defaultai.cpp", +"dlls/diablo.cpp", "dlls/doors.cpp", "dlls/effects.cpp", "dlls/explode.cpp", +"dlls/fgrenade.cpp", +"dlls/flybee.cpp", "dlls/flyingmonster.cpp", +"dlls/fog.cpp", +"dlls/fsniper.cpp", "dlls/func_break.cpp", "dlls/func_tank.cpp", +"dlls/func_vgui.cpp", "dlls/game.cpp", "dlls/gamerules.cpp", "dlls/gargantua.cpp", +"dlls/gauss.cpp", "dlls/genericmonster.cpp", "dlls/ggrenade.cpp", "dlls/globals.cpp", @@ -174,6 +170,7 @@ files{"dlls/agrunt.cpp", "dlls/h_cine.cpp", "dlls/h_cycler.cpp", "dlls/h_export.cpp", +"dlls/handgrenade.cpp", "dlls/hassassin.cpp", "dlls/headcrab.cpp", "dlls/healthkit.cpp", @@ -181,44 +178,63 @@ files{"dlls/agrunt.cpp", "dlls/hornet.cpp", "dlls/houndeye.cpp", "dlls/ichthyosaur.cpp", +"dlls/irgun.cpp", "dlls/islave.cpp", "dlls/items.cpp", "dlls/leech.cpp", +"dlls/lflammes.cpp", "dlls/lights.cpp", +"dlls/luciole.cpp", +"dlls/m16.cpp", "dlls/maprules.cpp", +"dlls/miroir.cpp", "dlls/monstermaker.cpp", "dlls/monsters.cpp", +"dlls/monsters.h", "dlls/monsterstate.cpp", "dlls/mortar.cpp", +"dlls/mp5.cpp", "dlls/multiplay_gamerules.cpp", +"dlls/music.cpp", "dlls/nihilanth.cpp", "dlls/nodes.cpp", -"dlls/observer.cpp", "dlls/osprey.cpp", "dlls/pathcorner.cpp", "dlls/plane.cpp", "dlls/plats.cpp", "dlls/player.cpp", -"dlls/playermonster.cpp", +"dlls/python.cpp", +"dlls/radiomsg.cpp", "dlls/rat.cpp", "dlls/roach.cpp", +"dlls/rpg.cpp", +"dlls/rpggrunt.cpp", +"dlls/satchel.cpp", "dlls/schedule.cpp", "dlls/scientist.cpp", "dlls/scripted.cpp", +"dlls/shotgun.cpp", "dlls/singleplay_gamerules.cpp", "dlls/skill.cpp", +"dlls/sniper.cpp", "dlls/sound.cpp", "dlls/soundent.cpp", "dlls/spectator.cpp", "dlls/squadmonster.cpp", +"dlls/squeakgrenade.cpp", "dlls/subs.cpp", +"dlls/supergun.cpp", +"dlls/t_sub.cpp", "dlls/talkmonster.cpp", +"dlls/tank.cpp", "dlls/teamplay_gamerules.cpp", "dlls/tempmonster.cpp", "dlls/tentacle.cpp", "dlls/triggers.cpp", +"dlls/tripmine.cpp", "dlls/turret.cpp", "dlls/util.cpp", +"dlls/util.h", "dlls/weapons.cpp", "dlls/world.cpp", "dlls/xen.cpp", @@ -238,11 +254,23 @@ buildoptions{"/def:" .. path.getabsolute("dlls/hl.def")} project("cl_dll") targetname("client") -files{"cl_dll/hl/hl_baseentity.cpp", +files{"cl_dll/clientbriquet.cpp", +"cl_dll/clientfog.cpp", +"cl_dll/clientlflammes.cpp", +"cl_dll/ev_hldm.cpp", +"cl_dll/GameStudioModelRenderer.cpp", +"cl_dll/hl/hl_baseentity.cpp", "cl_dll/hl/hl_events.cpp", "cl_dll/hl/hl_objects.cpp", "cl_dll/hl/hl_weapons.cpp", -"cl_dll/GameStudioModelRenderer.cpp", +"cl_dll/hud_tank.cpp", +"cl_dll/hudradio.cpp", +"cl_dll/hudrpg.cpp", +"cl_dll/hudzoom.cpp", +"cl_dll/lensflare.cpp", +"cl_dll/nvg.cpp", +"cl_dll/particules.cpp", +"cl_dll/studio_util.cpp", "cl_dll/StudioModelRenderer.cpp", "cl_dll/ammo.cpp", "cl_dll/ammo_secondary.cpp", @@ -253,7 +281,6 @@ files{"cl_dll/hl/hl_baseentity.cpp", "cl_dll/death.cpp", "cl_dll/demo.cpp", "cl_dll/entity.cpp", -"cl_dll/ev_hldm.cpp", "cl_dll/ev_common.cpp", "cl_dll/events.cpp", "cl_dll/flashlight.cpp", @@ -273,10 +300,10 @@ files{"cl_dll/hl/hl_baseentity.cpp", "cl_dll/message.cpp", "cl_dll/overview.cpp", "cl_dll/parsemsg.cpp", +"cl_dll/parsemsg.h", "cl_dll/saytext.cpp", "cl_dll/status_icons.cpp", "cl_dll/statusbar.cpp", -"cl_dll/studio_util.cpp", "cl_dll/text_message.cpp", "cl_dll/train.cpp", "cl_dll/tri.cpp", @@ -311,7 +338,12 @@ files{"cl_dll/vgui_int.cpp", "game_shared/vgui_loadtga.cpp", "game_shared/vgui_scrollbar2.cpp", "game_shared/vgui_slider2.cpp", -"game_shared/voice_banmgr.cpp"} +"game_shared/voice_banmgr.cpp", +"cl_dll/vgui_keypad.cpp", +"cl_dll/vgui_OrdiControl.cpp", +"cl_dll/vgui_OrdiMenu.cpp", +"cl_dll/vgui_radio.cpp", +"cl_dll/vgui_soin.cpp"} includedirs{"vgui-dev/include"} defines{"USE_VGUI"} diff --git a/dlls/Android.mk b/dlls/Android.mk index 1dc79616..23e8b569 100644 --- a/dlls/Android.mk +++ b/dlls/Android.mk @@ -1,5 +1,8 @@ #HLSDK server Android port #Copyright (c) nicknekit +#Edited by Roy for HL:Invasion +#Warning: Completely UNTESTED! +#Warning: Won't work properly as this mod requires TRUE VGUI! (If you can edit it in - you're more than welcome!) LOCAL_PATH := $(call my-dir) @@ -28,108 +31,124 @@ LOCAL_C_INCLUDES := $(SDL_PATH)/include \ $(LOCAL_PATH)/../pm_shared \ $(LOCAL_PATH)/../game_shared -LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \ - aflock.cpp \ - animating.cpp \ - animation.cpp \ - apache.cpp \ - barnacle.cpp \ - barney.cpp \ - bigmomma.cpp \ - bloater.cpp \ - bmodels.cpp \ - bullsquid.cpp \ - buttons.cpp \ - cbase.cpp \ - client.cpp \ - combat.cpp \ - controller.cpp \ - crossbow.cpp \ - crowbar.cpp \ - defaultai.cpp \ - doors.cpp \ - effects.cpp \ - egon.cpp \ - explode.cpp \ - flyingmonster.cpp \ - func_break.cpp \ - func_tank.cpp \ - game.cpp \ - gamerules.cpp \ - gargantua.cpp \ - gauss.cpp \ - genericmonster.cpp \ - ggrenade.cpp \ - globals.cpp \ - glock.cpp \ - gman.cpp \ - h_ai.cpp \ - h_battery.cpp \ - h_cycler.cpp \ - h_cine.cpp \ - h_export.cpp \ - handgrenade.cpp \ - hassassin.cpp \ - headcrab.cpp \ - healthkit.cpp \ - hgrunt.cpp \ - hornet.cpp \ - hornetgun.cpp \ - houndeye.cpp \ - ichthyosaur.cpp \ - islave.cpp \ - items.cpp \ - leech.cpp \ - lights.cpp \ - maprules.cpp \ - monstermaker.cpp \ - monsters.cpp \ - monsterstate.cpp \ - mortar.cpp \ - mp5.cpp \ - multiplay_gamerules.cpp \ - nihilanth.cpp \ - nodes.cpp \ - observer.cpp \ - osprey.cpp \ - pathcorner.cpp \ - plane.cpp \ - plats.cpp \ - player.cpp \ - playermonster.cpp \ - python.cpp \ - rat.cpp \ - roach.cpp \ - rpg.cpp \ - satchel.cpp \ - schedule.cpp \ - scientist.cpp \ - scripted.cpp \ - shotgun.cpp \ - singleplay_gamerules.cpp \ - skill.cpp \ - sound.cpp \ - soundent.cpp \ - spectator.cpp \ - squadmonster.cpp \ - squeakgrenade.cpp \ - subs.cpp \ - talkmonster.cpp \ - teamplay_gamerules.cpp \ - tentacle.cpp \ - tempmonster.cpp \ - triggers.cpp \ - tripmine.cpp \ - turret.cpp \ - util.cpp \ - weapons.cpp \ - world.cpp \ - xen.cpp \ - zombie.cpp \ - ../pm_shared/pm_debug.c \ - ../pm_shared/pm_math.c \ - ../pm_shared/pm_shared.c -# ../game_shared/voice_gamemgr.cpp +LOCAL_SRC_FILES := aflock.cpp \ + agrunt.cpp \ + airtank.cpp \ + animating.cpp \ + animation.cpp \ + apache.cpp \ + barnacle.cpp \ + barney.cpp \ + bigmomma.cpp \ + bloater.cpp \ + bmodels.cpp \ + briquet.cpp \ + bullsquid.cpp \ + buttons.cpp \ + cbase.cpp \ + client.cpp \ + combat.cpp \ + controller.cpp \ + crowbar.cpp \ + defaultai.cpp \ + diablo.cpp \ + doors.cpp \ + effects.cpp \ + explode.cpp \ + fgrenade.cpp \ + flybee.cpp \ + flyingmonster.cpp \ + fog.cpp \ + fsniper.cpp \ + func_break.cpp \ + func_tank.cpp \ + func_vgui.cpp \ + game.cpp \ + gamerules.cpp \ + gargantua.cpp \ + gauss.cpp \ + genericmonster.cpp \ + ggrenade.cpp \ + globals.cpp \ + gman.cpp \ + h_ai.cpp \ + h_battery.cpp \ + h_cine.cpp \ + h_cycler.cpp \ + h_export.cpp \ + handgrenade.cpp \ + hassassin.cpp \ + headcrab.cpp \ + healthkit.cpp \ + hgrunt.cpp \ + glock.cpp \ + hornet.cpp \ + houndeye.cpp \ + ichthyosaur.cpp \ + irgun.cpp \ + islave.cpp \ + items.cpp \ + leech.cpp \ + lflammes.cpp \ + lights.cpp \ + luciole.cpp \ + m16.cpp \ + maprules.cpp \ + miroir.cpp \ + monstermaker.cpp \ + monsters.cpp \ + monsters.h \ + monsterstate.cpp \ + mortar.cpp \ + mp5.cpp \ + multiplay_gamerules.cpp \ + music.cpp \ + nihilanth.cpp \ + nodes.cpp \ + osprey.cpp \ + pathcorner.cpp \ + plane.cpp \ + plats.cpp \ + player.cpp \ + ../pm_shared/pm_debug.c \ + ../pm_shared/pm_math.c \ + ../pm_shared/pm_shared.c \ + python.cpp \ + radiomsg.cpp \ + rat.cpp \ + roach.cpp \ + rpg.cpp \ + rpggrunt.cpp \ + satchel.cpp \ + schedule.cpp \ + scientist.cpp \ + scripted.cpp \ + shotgun.cpp \ + singleplay_gamerules.cpp \ + skill.cpp \ + sniper.cpp \ + sound.cpp \ + soundent.cpp \ + spectator.cpp \ + squadmonster.cpp \ + squeakgrenade.cpp \ + subs.cpp \ + supergun.cpp \ + t_sub.cpp \ + talkmonster.cpp \ + tank.cpp \ + teamplay_gamerules.cpp \ + tempmonster.cpp \ + tentacle.cpp \ + triggers.cpp \ + tripmine.cpp \ + turret.cpp \ + util.cpp \ + util.h \ + weapons.cpp \ + world.cpp \ + xen.cpp \ + zombie.cpp LOCAL_LDLIBS := -llog diff --git a/dlls/compile.bat b/dlls/compile.bat index f97806a5..c84c95ed 100644 --- a/dlls/compile.bat +++ b/dlls/compile.bat @@ -1,4 +1,7 @@ @echo off +@rem "Edited by Roy for HL:Invasion" +@rem "Warning: Completely UNTESTED!" +@rem "Warning: Won't work properly as this mod requires TRUE VGUI! (If you can edit it in - you're more than welcome!)" echo Setting environment for minimal Visual C++ 6 set INCLUDE=%MSVCDir%\VC98\Include set LIB=%MSVCDir%\VC98\Lib @@ -8,9 +11,9 @@ echo -- Compiler is MSVC6 set XASH3DSRC=..\..\Xash3D_original set INCLUDES=-I../common -I../engine -I../pm_shared -I../game_shared -I../public -set SOURCES=agrunt.cpp ^ +set SOURCES=aflock.cpp ^ + agrunt.cpp ^ airtank.cpp ^ - aflock.cpp ^ animating.cpp ^ animation.cpp ^ apache.cpp ^ @@ -19,22 +22,27 @@ set SOURCES=agrunt.cpp ^ bigmomma.cpp ^ bloater.cpp ^ bmodels.cpp ^ + briquet.cpp ^ bullsquid.cpp ^ buttons.cpp ^ cbase.cpp ^ client.cpp ^ combat.cpp ^ controller.cpp ^ - crossbow.cpp ^ crowbar.cpp ^ defaultai.cpp ^ + diablo.cpp ^ doors.cpp ^ effects.cpp ^ - egon.cpp ^ explode.cpp ^ + fgrenade.cpp ^ + flybee.cpp ^ flyingmonster.cpp ^ + fog.cpp ^ + fsniper.cpp ^ func_break.cpp ^ func_tank.cpp ^ + func_vgui.cpp ^ game.cpp ^ gamerules.cpp ^ gargantua.cpp ^ @@ -42,7 +50,6 @@ set SOURCES=agrunt.cpp ^ genericmonster.cpp ^ ggrenade.cpp ^ globals.cpp ^ - glock.cpp ^ gman.cpp ^ h_ai.cpp ^ h_battery.cpp ^ @@ -54,34 +61,41 @@ set SOURCES=agrunt.cpp ^ headcrab.cpp ^ healthkit.cpp ^ hgrunt.cpp ^ + glock.cpp ^ hornet.cpp ^ - hornetgun.cpp ^ houndeye.cpp ^ ichthyosaur.cpp ^ + irgun.cpp ^ islave.cpp ^ items.cpp ^ leech.cpp ^ + lflammes.cpp ^ lights.cpp ^ + luciole.cpp ^ + m16.cpp ^ maprules.cpp ^ + miroir.cpp ^ monstermaker.cpp ^ monsters.cpp ^ + monsters.h ^ monsterstate.cpp ^ mortar.cpp ^ mp5.cpp ^ multiplay_gamerules.cpp ^ + music.cpp ^ nihilanth.cpp ^ nodes.cpp ^ - observer.cpp ^ osprey.cpp ^ pathcorner.cpp ^ plane.cpp ^ plats.cpp ^ player.cpp ^ - playermonster.cpp ^ python.cpp ^ + radiomsg.cpp ^ rat.cpp ^ roach.cpp ^ rpg.cpp ^ + rpggrunt.cpp ^ satchel.cpp ^ schedule.cpp ^ scientist.cpp ^ @@ -89,13 +103,17 @@ set SOURCES=agrunt.cpp ^ shotgun.cpp ^ singleplay_gamerules.cpp ^ skill.cpp ^ + sniper.cpp ^ sound.cpp ^ soundent.cpp ^ spectator.cpp ^ squadmonster.cpp ^ squeakgrenade.cpp ^ subs.cpp ^ + supergun.cpp ^ + t_sub.cpp ^ talkmonster.cpp ^ + tank.cpp ^ teamplay_gamerules.cpp ^ tempmonster.cpp ^ tentacle.cpp ^ @@ -103,6 +121,7 @@ set SOURCES=agrunt.cpp ^ tripmine.cpp ^ turret.cpp ^ util.cpp ^ + util.h ^ weapons.cpp ^ world.cpp ^ xen.cpp ^ diff --git a/dlls/wscript b/dlls/wscript index 33d37185..4fd5effe 100644 --- a/dlls/wscript +++ b/dlls/wscript @@ -1,6 +1,9 @@ #! /usr/bin/env python # encoding: utf-8 # a1batross, mittorn, 2018 +# Edited by Roy for HL:Invasion +# Warning: Completely UNTESTED! +# Warning: Won't work properly as this mod requires TRUE VGUI! (If you can edit it in - you're more than welcome!) from waflib import Utils import os @@ -26,33 +29,38 @@ def build(bld): ]) source += [ + 'aflock.cpp', 'agrunt.cpp', 'airtank.cpp', - 'aflock.cpp', 'animating.cpp', 'animation.cpp', - 'apache.cpp', + 'apache.cpp', 'barnacle.cpp', 'barney.cpp', 'bigmomma.cpp', 'bloater.cpp', 'bmodels.cpp', + 'briquet.cpp', 'bullsquid.cpp', - 'buttons.cpp', + 'buttons.cpp', 'cbase.cpp', 'client.cpp', 'combat.cpp', 'controller.cpp', - 'crossbow.cpp', - 'crowbar.cpp', + 'crowbar.cpp', 'defaultai.cpp', - 'doors.cpp', + 'diablo.cpp', + 'doors.cpp', 'effects.cpp', - 'egon.cpp', - 'explode.cpp', + 'explode.cpp', + 'fgrenade.cpp', + 'flybee.cpp', 'flyingmonster.cpp', + 'fog.cpp', + 'fsniper.cpp', 'func_break.cpp', - 'func_tank.cpp', + 'func_tank.cpp', + 'func_vgui.cpp', 'game.cpp', 'gamerules.cpp', 'gargantua.cpp', @@ -60,8 +68,7 @@ def build(bld): 'genericmonster.cpp', 'ggrenade.cpp', 'globals.cpp', - 'glock.cpp', - 'gman.cpp', + 'gman.cpp', 'h_ai.cpp', 'h_battery.cpp', 'h_cine.cpp', @@ -69,58 +76,70 @@ def build(bld): 'h_export.cpp', 'handgrenade.cpp', 'hassassin.cpp', - 'headcrab.cpp', + 'headcrab.cpp', 'healthkit.cpp', 'hgrunt.cpp', + 'glock.cpp', 'hornet.cpp', - 'hornetgun.cpp', - 'houndeye.cpp', + 'houndeye.cpp', 'ichthyosaur.cpp', + 'irgun.cpp', 'islave.cpp', - 'items.cpp', + 'items.cpp', 'leech.cpp', - 'lights.cpp', + 'lflammes.cpp', + 'lights.cpp', + 'luciole.cpp', + 'm16.cpp', 'maprules.cpp', + 'miroir.cpp', 'monstermaker.cpp', 'monsters.cpp', + 'monsters.h', 'monsterstate.cpp', 'mortar.cpp', 'mp5.cpp', - 'multiplay_gamerules.cpp', + 'multiplay_gamerules.cpp', + 'music.cpp', 'nihilanth.cpp', - 'nodes.cpp', - 'observer.cpp', - 'osprey.cpp', + 'nodes.cpp', + 'osprey.cpp', 'pathcorner.cpp', 'plane.cpp', 'plats.cpp', 'player.cpp', - 'playermonster.cpp', - 'python.cpp', + 'python.cpp', + 'radiomsg.cpp', 'rat.cpp', 'roach.cpp', - 'rpg.cpp', + 'rpg.cpp', + 'rpggrunt.cpp', 'satchel.cpp', 'schedule.cpp', 'scientist.cpp', 'scripted.cpp', 'shotgun.cpp', 'singleplay_gamerules.cpp', - 'skill.cpp', + 'skill.cpp', + 'sniper.cpp', 'sound.cpp', 'soundent.cpp', 'spectator.cpp', 'squadmonster.cpp', 'squeakgrenade.cpp', - 'subs.cpp', + 'subs.cpp', + 'supergun.cpp', + 't_sub.cpp', 'talkmonster.cpp', + 'tank.cpp', 'teamplay_gamerules.cpp', 'tempmonster.cpp', - 'tentacle.cpp', + 'tentacle.cpp', 'triggers.cpp', 'tripmine.cpp', - 'turret.cpp', - 'util.cpp', + 'turret.cpp', + 'util.cpp', + 'util.h', 'weapons.cpp', 'world.cpp', 'xen.cpp',