From 14c3669cf04de071b5dae98f6ada9048e5f0a9dd Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 2 Jun 2021 12:42:13 +0200
Subject: [PATCH] build_editor.sh: switch from cmake to make compilation, since
 the upstream change

---
 build_editor.sh | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/build_editor.sh b/build_editor.sh
index 5aab6187..329684bd 100755
--- a/build_editor.sh
+++ b/build_editor.sh
@@ -9,7 +9,7 @@ mv_wsfile()
 
 set -e
 
-WS_MAKEFILE=./src/worldspawn/CMakeLists.txt
+WS_MAKEFILE=./src/worldspawn/Makefile
 COMPILE_SYS=$(uname)
 
 # Check how many cores/processors we should use for building
@@ -44,7 +44,8 @@ else
 	cd ./worldspawn
 fi
 
-cmake -G "Unix Makefiles" -H. -Bbuild -DCMAKE_BUILD_TYPE=Release "$CM_OPTION" && cmake --build build -- -j $BUILD_PROC
+gmake clean
+gmake -j $BUILD_PROC
 
 mkdir -p ../../bin/bitmaps
 mv_wsfile bitmaps/black.xpm
@@ -154,24 +155,20 @@ mv_wsfile gl/zfill_fp.glsl
 mv_wsfile gl/zfill_vp.glp
 mv_wsfile gl/zfill_vp.glsl
 mv_wsfile global.xlink
-mkdir -p ../../bin/modules
-mv_wsfile modules/libarchivezip.so
-mv_wsfile modules/libentity.so
-mv_wsfile modules/libimage.so
-mv_wsfile modules/libiqmmodel.so
-mv_wsfile modules/libmapq3.so
-mv_wsfile modules/libmodel.so
-mv_wsfile modules/libshaders.so
-mv_wsfile modules/libvfspk3.so
 mkdir -p ../../bin/plugins
+mv_wsfile plugins/libarchivezip.so
+mv_wsfile plugins/libentity.so
+mv_wsfile plugins/libimage.so
+mv_wsfile plugins/libiqmmodel.so
+mv_wsfile plugins/libmapq3.so
+mv_wsfile plugins/libmodel.so
+mv_wsfile plugins/libshaders.so
+mv_wsfile plugins/libvfspk3.so
 mv_wsfile plugins/libbrushexport.so
 mv_wsfile plugins/libprtview.so
 mkdir -p ../../bin/platform.game
 mv_wsfile platform.game/default_build_menu.xml
 mkdir -p ../../bin/platform.game/platform
 mv_wsfile platform.game/platform/entities.def
-mv_wsfile WorldSpawn_MAJOR
-mv_wsfile WorldSpawn_MINOR
-mv_wsfile WorldSpawn_PATCH
 mv_wsfile worldspawn
 mv_wsfile vmap