fix compilation with advanced compiler and add enter vehicle to main …

…build
ate47 · Oct 17, 2023 · 7e1fa57 · 7e1fa57
1 parent 6bba07e
commit 7e1fa57
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/gsc.conf b/gsc.conf
@@ -10,8 +10,3 @@ game=T8
 script=scripts\core_common\load_shared.gsc
 script_client=scripts\core_common\load_shared.csc
 
-
-# enable custom compiler features
-client=true
-dll=true
-dll.lazylink=true
diff --git a/scripts/core_common/ui/menu_items.gsc b/scripts/core_common/ui/menu_items.gsc
@@ -601,6 +601,8 @@ init_menus() {
         foreach (key, veh_item in get_vehicles_enum_data().vehicles) {
             self add_menu_item("vehicle_wz", veh_item.title, &func_spawn_vehicle, veh_item.name);
         }
+
+        self add_menu_item("vehicle_wz", "Enter vehicle", &func_enter_vehicle);
     }
 
     if (!(is_warzone() && isdefined(self.atianconfig.force_blackout_map)) && !(is_multiplayer() && isdefined(self.atianconfig.mp_force_map))) {

diff --git a/scripts/core_common/ui/menu_items_dev.gsc b/scripts/core_common/ui/menu_items_dev.gsc
@@ -17,8 +17,6 @@ init_menus_dev() {
     self add_menu_item("actor_tool", "ST male t2", &func_spawn_actor, "spawner_mp_swat_gunner_team2_male", "swat_gunner");
     self add_menu_item("actor_tool", "ST female t2", &func_spawn_actor, "spawner_mp_swat_gunner_team2_female", "swat_gunner");
 
-    self add_menu_item("vehicle_wz", "Enter vehicle", &func_enter_vehicle);
-
     self add_menu("dev_model_search", "Model search", "tool_menu_dev", true);
     foreach (e in array (
         #"hash_2c0078538e398b4f", "p8_zm_zod_light_morse_lamp"

diff --git a/shell_scripts/compile.ps1 b/shell_scripts/compile.ps1
@@ -34,7 +34,7 @@ try {
     Write-Host "Compiling project"
 
     if ($Ps4) {
-        .\build\compiler\t7compiler\DebugCompiler.exe --compile --noupdate -DCI -D__PS4
+        .\build\compiler\t7compiler\DebugCompiler.exe --compile --noupdate -DCI -D__PS4 -Cdll=false
     }
     else {
         .\build\compiler\t7compiler\DebugCompiler.exe --compile --noupdate -DCI

diff --git a/shell_scripts/compiler_pc.ps1 b/shell_scripts/compiler_pc.ps1
@@ -6,12 +6,12 @@ try {
     $base = (Get-Item $PSScriptRoot).Parent
     Set-Location ($base.Fullname)
 
-    $compilerPath = (Get-Item (Get-Command debugcompiler.exe).Source).Parent
+    $compilerPath = (Get-Item ((Get-Command debugcompiler.exe).Source)).FullName | split-path -parent
 
-    # Set the ps4 opcodes
+    # Set the pc opcodes
     Copy-Item "$compilerPath/vm_codes_pc.db2" "$compilerPath/vm_codes.db2" -Force
 
-    debugcompiler.exe --build --noupdate
+    debugcompiler.exe --build --noupdate -Cclient=true -Cdll=true -Cdll.lazylink=true
 
     if (!$?) {
         Write-Error "Error when compiling";

diff --git a/shell_scripts/compiler_ps4.ps1 b/shell_scripts/compiler_ps4.ps1
@@ -10,13 +10,12 @@ try {
     $base = (Get-Item $PSScriptRoot).Parent
     Set-Location ($base.Fullname)
 
-    $compilerPath = (Get-Item (Get-Command debugcompiler.exe).Source).Parent
+    $compilerPath = (Get-Item ((Get-Command debugcompiler.exe).Source)).FullName | split-path -parent
 
     # Set the ps4 opcodes
     Copy-Item "$compilerPath/vm_codes_ps4.db2" "$compilerPath/vm_codes.db2" -Force
 
-    debugcompiler.exe --compile --noupdate -D__PS4
-
+    debugcompiler.exe --compile --noupdate -D__PS4 -DATIAN_MENU_DEV
     if (!$?) {
         Write-Error "Error when compiling";
         exit -1;