Skip to content

Commit

Permalink
Remove stuff that doesn't work on current MIN_COMPILER_VERSION (#14069)
Browse files Browse the repository at this point in the history
  • Loading branch information
vvvv-vvvv authored Oct 3, 2023
1 parent a057340 commit ac497e6
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 50 deletions.
Binary file removed byond-extools.dll
Binary file not shown.
5 changes: 0 additions & 5 deletions code/__DEFINES/_tick.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
/// Percentage of tick to leave for master controller to run
#define MAPTICK_MC_MIN_RESERVE 40
/// internal_tick_usage is updated every tick by extools
#ifdef USE_EXTOOLS
#define MAPTICK_LAST_INTERNAL_TICK_USAGE ((GLOB.internal_tick_usage / world.tick_lag) * 100)
#else
#define MAPTICK_LAST_INTERNAL_TICK_USAGE (world.map_cpu)
#endif
/// Amount of a tick to reserve for byond if MAPTICK_LAST_INTERNAL_TICK_USAGE is 0 or not working.
#define TICK_BYOND_RESERVE 2
/// Tick limit while running normally
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,6 @@ GLOBAL_VAR_INIT(global_unique_id, 1)

//Actually better performant than reverse_direction()
#define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) )

// shorter way to write as anything
#define AS as anything
11 changes: 0 additions & 11 deletions code/__byond_version_compat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,6 @@
#warn WARNING! your byond version is over the recommended version! There may be unexpected byond bugs!
#endif

//Don't load extools on 514
#if DM_VERSION < 514
#define USE_EXTOOLS
#endif

#if DM_BUILD < 1540
#define AS as()
#else
#define AS as anything
#endif

// So we want to have compile time guarantees these procs exist on local type, unfortunately 515 killed the .proc/procname syntax so we have to use nameof()
#if DM_VERSION < 515
/// Call by name proc reference, checks if the proc exists on this type or as a global proc
Expand Down
6 changes: 0 additions & 6 deletions code/game/world.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ GLOBAL_VAR(restart_counter)
return
#endif

#ifdef USE_EXTOOLS
var/extools = world.GetConfig("env", "EXTOOLS_DLL") || (world.system_type == MS_WINDOWS ? "./byond-extools.dll" : "./libbyond-extools.so")
if(fexists(extools))
LIBCALL(extools, "maptick_initialize")()
#endif

Profile(PROFILE_RESTART)
Profile(PROFILE_RESTART, type = "sendmaps")

Expand Down
3 changes: 0 additions & 3 deletions dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ export NODE_VERSION_PRECISE=14.16.1
export SPACEMAN_DMM_VERSION=suite-1.7.2
export SPACEMAN_DMM_COMMIT_HASH=3588de97ff09fdd02d96f178392f3c59b19ebfc4

# Extools git tag
export EXTOOLS_VERSION=v0.0.7

# Python version for mapmerge and other tools
export PYTHON_VERSION=3.7.9
25 changes: 0 additions & 25 deletions tools/tgs4_scripts/PreCompile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,6 @@ env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target=i686-un
mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so"
cd ..

# get dependencies for extools
apt-get install -y cmake build-essential gcc-multilib g++-multilib cmake wget

# update extools
if [ ! -d "extools" ]; then
echo "Cloning extools..."
git clone https://github.com/MCHSL/extools
cd extools/byond-extools
else
echo "Fetching extools..."
cd extools/byond-extools
git fetch
fi

echo "Deploying extools..."
git checkout "$EXTOOLS_VERSION"
if [ -d "build" ]; then
rm -R build
fi
mkdir build
cd build
cmake ..
make
mv libbyond-extools.so "$1/libbyond-extools.so"
cd ../../..

# compile tgui
echo "Compiling tgui..."
Expand Down

0 comments on commit ac497e6

Please sign in to comment.