From 219f6892f169cc3f009f353afb7154f3ea6a24a3 Mon Sep 17 00:00:00 2001 From: vl Date: Sat, 14 Sep 2024 20:33:16 +0500 Subject: [PATCH] lost coast building --- .github/workflows/build.yml | 4 +- game/client/client_lostcoast.vpc | 115 +++++++++++++++++++++++++++++++ game/client/wscript | 1 + game/server/server_lostcoast.vpc | 30 ++++++++ game/server/wscript | 1 + scripts/build-android-aarch64.sh | 2 +- scripts/build-android-armv7a.sh | 2 +- scripts/build-apk.sh | 6 +- scripts/build-macos-amd64.sh | 2 +- scripts/build-ubuntu-amd64.sh | 2 +- scripts/build-ubuntu-i386.sh | 2 +- 11 files changed, 157 insertions(+), 10 deletions(-) create mode 100644 game/client/client_lostcoast.vpc create mode 100644 game/server/server_lostcoast.vpc diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e463f25c..63eccb44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: - name: Build windows-i386 run: | git submodule init && git submodule update - ./waf.bat configure -T release --prefix=bin --32bits + ./waf.bat configure -T release --build-games=lostcoast --prefix=bin --32bits ./waf.bat install - name: 'Upload Artifact' @@ -56,7 +56,7 @@ jobs: - name: Build windows-amd64 run: | git submodule init && git submodule update - ./waf.bat configure -T release --prefix=bin + ./waf.bat configure -T release --build-games=lostcoast --prefix=bin ./waf.bat install - name: 'Upload Artifact' diff --git a/game/client/client_lostcoast.vpc b/game/client/client_lostcoast.vpc new file mode 100644 index 00000000..978a5059 --- /dev/null +++ b/game/client/client_lostcoast.vpc @@ -0,0 +1,115 @@ +//----------------------------------------------------------------------------- +// CLIENT_LOSTCOAST.VPC +// +// Project Script +//----------------------------------------------------------------------------- + +$Macro SRCDIR "..\.." +$Macro GAMENAME "lostcoast" + +$Include "$SRCDIR\game\client\client_base.vpc" + +$Configuration +{ + $Compiler + { + $AdditionalIncludeDirectories "$BASE;hl2,.\hl2\elements,$SRCDIR\game\shared\hl2" + $PreprocessorDefinitions "$BASE;HL2_CLIENT_DLL;HL2_LOSTCOAST" + } +} + +$Project "Client (LostCoast)" +{ + $Folder "Source Files" + { + $File "hud_chat.cpp" + $File "c_team_objectiveresource.cpp" + $File "c_team_objectiveresource.h" + + $Folder "HL2 DLL" + { + $File "$SRCDIR\game\shared\hl2\basehlcombatweapon_shared.cpp" + $File "$SRCDIR\game\shared\hl2\achievements_hl2.cpp" + $File "hl2\c_antlion_dust.cpp" + $File "hl2\c_ar2_explosion.cpp" + $File "hl2\c_barnacle.cpp" + $File "hl2\c_barney.cpp" + $File "hl2\c_basehelicopter.cpp" + $File "hl2\c_basehelicopter.h" + $File "hl2\c_basehlcombatweapon.cpp" + $File "hl2\c_basehlcombatweapon.h" + $File "hl2\c_basehlplayer.cpp" + $File "hl2\c_basehlplayer.h" + $File "hl2\c_citadel_effects.cpp" + $File "hl2\c_corpse.cpp" + $File "hl2\c_corpse.h" + $File "hl2\c_env_alyxtemp.cpp" + $File "hl2\c_env_headcrabcanister.cpp" + $File "hl2\c_env_starfield.cpp" + $File "hl2\c_func_tankmortar.cpp" + $File "hl2\c_hl2_playerlocaldata.cpp" + $File "hl2\c_hl2_playerlocaldata.h" + $File "hl2\c_info_teleporter_countdown.cpp" + $File "hl2\c_npc_antlionguard.cpp" + $File "hl2\c_npc_combinegunship.cpp" + $File "hl2\c_npc_manhack.cpp" + $File "hl2\c_npc_rollermine.cpp" + $File "hl2\c_plasma_beam_node.cpp" + $File "hl2\c_prop_combine_ball.cpp" + $File "hl2\c_prop_combine_ball.h" + $File "hl2\c_rotorwash.cpp" + $File "hl2\c_script_intro.cpp" + $File "$SRCDIR\game\shared\script_intro_shared.cpp" + $File "hl2\c_strider.cpp" + $File "hl2\c_te_concussiveexplosion.cpp" + $File "hl2\c_te_flare.cpp" + $File "hl2\c_thumper_dust.cpp" + $File "hl2\c_vehicle_airboat.cpp" + $File "hl2\c_vehicle_cannon.cpp" + $File "hl2\c_vehicle_crane.cpp" + $File "hl2\c_vehicle_crane.h" + $File "hl2\c_vehicle_prisoner_pod.cpp" + $File "hl2\c_weapon__stubs_hl2.cpp" + $File "hl2\c_weapon_crossbow.cpp" + $File "hl2\c_weapon_physcannon.cpp" + $File "hl2\c_weapon_stunstick.cpp" + $File "$SRCDIR\game\shared\hl2\citadel_effects_shared.h" + $File "hl2\clientmode_hlnormal.cpp" + $File "hl2\clientmode_hlnormal.h" + $File "death.cpp" + $File "$SRCDIR\game\shared\hl2\env_headcrabcanister_shared.cpp" + $File "$SRCDIR\game\shared\hl2\env_headcrabcanister_shared.h" + $File "hl2\fx_antlion.cpp" + $File "hl2\fx_bugbait.cpp" + $File "hl2\fx_hl2_impacts.cpp" + $File "hl2\fx_hl2_tracers.cpp" + $File "hl2\hl2_clientmode.cpp" + $File "$SRCDIR\game\shared\hl2\hl2_gamerules.cpp" + $File "$SRCDIR\game\shared\hl2\hl2_gamerules.h" + $File "$SRCDIR\game\shared\hl2\hl2_shareddefs.h" + $File "$SRCDIR\game\shared\hl2\hl2_usermessages.cpp" + $File "$SRCDIR\game\shared\hl2\hl_gamemovement.cpp" + $File "$SRCDIR\game\shared\hl2\hl_gamemovement.h" + $File "hl2\hl_in_main.cpp" + $File "hl2\hl_prediction.cpp" + $File "hl2\hud_ammo.cpp" + $File "hl2\hud_battery.cpp" + $File "hl2\hud_blood.cpp" + $File "hl2\hud_credits.cpp" + $File "hl2\hud_damageindicator.cpp" + $File "hl2\hud_flashlight.cpp" + $File "hl2\hud_health.cpp" + $File "hl2\hud_poisondamageindicator.cpp" + $File "hud_posture.cpp" + $File "hl2\hud_quickinfo.cpp" + $File "hud_squadstatus.cpp" + $File "hl2\hud_suitpower.cpp" + $File "hl2\hud_suitpower.h" + $File "hl2\hud_weaponselection.cpp" + $File "hl2\hud_zoom.cpp" + $File "hl2\shieldproxy.cpp" + $File "hl2\vgui_rootpanel_hl2.cpp" + $File "episodic\c_vort_charge_token.cpp" + } + } +} diff --git a/game/client/wscript b/game/client/wscript index c454d535..87dfb779 100755 --- a/game/client/wscript +++ b/game/client/wscript @@ -16,6 +16,7 @@ games = { 'hl2mp': ['client_base.vpc', 'client_hl2mp.vpc'], 'hl1': ['client_base.vpc', 'client_hl1.vpc'], 'episodic': ['client_base.vpc', 'client_episodic.vpc'], + 'lostcoast': ['client_base.vpc', 'client_lostcoast.vpc'], 'portal': ['client_base.vpc', 'client_portal.vpc'], 'hl1mp': ['client_base.vpc', 'client_hl1mp.vpc'], 'cstrike': ['client_base.vpc', 'client_cstrike.vpc'], diff --git a/game/server/server_lostcoast.vpc b/game/server/server_lostcoast.vpc new file mode 100644 index 00000000..fc472859 --- /dev/null +++ b/game/server/server_lostcoast.vpc @@ -0,0 +1,30 @@ +//----------------------------------------------------------------------------- +// SERVER_EPISODIC.VPC +// +// Project Script +//----------------------------------------------------------------------------- + +$Macro SRCDIR "..\.." +$Macro GAMENAME "episodic" [!$SOURCESDK] +$Macro GAMENAME "mod_episodic" [$SOURCESDK] + +$Include "$SRCDIR\game\server\server_base.vpc" + +$Configuration +{ + $Compiler + { + $AdditionalIncludeDirectories "$BASE;$SRCDIR\game\shared\hl2;$SRCDIR\game\shared\episodic;.\hl2;.\episodic" + $PreprocessorDefinitions "$BASE;HL2_DLL;HL2_EPISODIC;USES_SAVERESTORE" + } +} + +$Project "Server (Episodic)" +{ + $Folder "Source Files" + { + $File "weapon_oldmanharpoon.cpp" + // я вот не понимаю, почему они не добавили эту энтити в эпизоды, + // чтобы можно просто было через -game lostcoast запустить + } +} diff --git a/game/server/wscript b/game/server/wscript index 1b6d834d..491b1828 100755 --- a/game/server/wscript +++ b/game/server/wscript @@ -11,6 +11,7 @@ PROJECT_NAME = 'server' games = { 'hl2': ['server_base.vpc', 'server_hl2.vpc'], 'episodic':['server_base.vpc', 'server_episodic.vpc'], + 'lostcoast':['server_base.vpc', 'server_lostcoast.vpc'], 'hl2mp': ['server_base.vpc', 'server_hl2mp.vpc'], 'portal': ['server_base.vpc', 'server_portal.vpc'], 'hl1': ['server_base.vpc', 'server_hl1.vpc'], diff --git a/scripts/build-android-aarch64.sh b/scripts/build-android-aarch64.sh index 5df0886c..0abecb36 100644 --- a/scripts/build-android-aarch64.sh +++ b/scripts/build-android-aarch64.sh @@ -1,7 +1,7 @@ #!/bin/sh export ANDROID_NDK_HOME=$PWD/android-ndk-r10e/ export PATH="$PWD/clang+llvm-11.1.0-x86_64-linux-gnu-ubuntu-16.04/bin:$PATH" -./waf configure -T release --build-game=episodic --prefix=srceng-mod-launcher/android --android=aarch64,host,21 --target=../aarch64 --enable-opus --togles --disable-warns && +./waf configure -T release --build-game=lostcoast --prefix=srceng-mod-launcher/android --android=aarch64,host,21 --target=../aarch64 --enable-opus --togles --disable-warns && ./waf install --target=client,server --strip if [ -e "srceng-mod-launcher/android/lib/arm64-v8a/README.md" ]; then diff --git a/scripts/build-android-armv7a.sh b/scripts/build-android-armv7a.sh index 1d380b8c..f318a6eb 100755 --- a/scripts/build-android-armv7a.sh +++ b/scripts/build-android-armv7a.sh @@ -6,7 +6,7 @@ export ANDROID_NDK_HOME=$PWD/android-ndk-r10e/ wget https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/clang+llvm-11.1.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz -o /dev/null tar -xf clang+llvm-11.1.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz export PATH="$PWD/clang+llvm-11.1.0-x86_64-linux-gnu-ubuntu-16.04/bin:$PATH" -./waf configure -T release --build-game=episodic --prefix=srceng-mod-launcher/android --android=armeabi-v7a-hard,host,21 --target=../armeabi-v7a --32bits --enable-opus --togles --disable-warns && +./waf configure -T release --build-game=lostcoast --prefix=srceng-mod-launcher/android --android=armeabi-v7a-hard,host,21 --target=../armeabi-v7a --32bits --enable-opus --togles --disable-warns && ./waf install --target=client,server --strip if [ -e "srceng-mod-launcher/android/lib/armeabi-v7a/README.md" ]; then diff --git a/scripts/build-apk.sh b/scripts/build-apk.sh index affba562..f7d93685 100644 --- a/scripts/build-apk.sh +++ b/scripts/build-apk.sh @@ -1,6 +1,6 @@ -export ICON=tf2.png -export PACKAGE=episodic -export APP_NAME="Default APP NAME" +export ICON=lc.png +export PACKAGE=lostcoast +export APP_NAME="Half-Life 2: Lost Coast" cd srceng-mod-launcher git clone https://gitlab.com/LostGamer/android-sdk export ANDROID_SDK_HOME=$PWD/android-sdk diff --git a/scripts/build-macos-amd64.sh b/scripts/build-macos-amd64.sh index 790aee4f..70a802ce 100755 --- a/scripts/build-macos-amd64.sh +++ b/scripts/build-macos-amd64.sh @@ -4,5 +4,5 @@ git submodule init && git submodule update brew install sdl2 -./waf configure -T release --disable-warns --prefix=bin $* && +./waf configure -T release --disable-warns --build-games=lostcoast --prefix=bin $* && ./waf install --strip diff --git a/scripts/build-ubuntu-amd64.sh b/scripts/build-ubuntu-amd64.sh index 16b9f158..3f9e62ff 100755 --- a/scripts/build-ubuntu-amd64.sh +++ b/scripts/build-ubuntu-amd64.sh @@ -4,5 +4,5 @@ git submodule init && git submodule update sudo apt-get update sudo apt-get install -f -y libopenal-dev g++-multilib gcc-multilib libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev libedit-dev -./waf configure -T release --build-game=episodic --prefix=bin --disable-warns $* && +./waf configure -T release --build-game=lostcoast --prefix=bin --disable-warns $* && ./waf install --strip diff --git a/scripts/build-ubuntu-i386.sh b/scripts/build-ubuntu-i386.sh index 3cc39228..e8d41829 100755 --- a/scripts/build-ubuntu-i386.sh +++ b/scripts/build-ubuntu-i386.sh @@ -6,5 +6,5 @@ sudo apt-get update sudo apt-get install -y aptitude sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386 -PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --prefix=bin --build-games=episodic --disable-warns --32bits $* && +PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --prefix=bin --build-games=lostcoast --disable-warns --32bits $* && ./waf install --strip