Preprocessor purge round 10: LUACONSOLE

meson.build

@@ -349,6 +349,7 @@ conf_data.set('APPEXE', app_exe)
 conf_data.set('APPID', app_id)
 conf_data.set('APPDATA', get_option('app_data'))
 conf_data.set('APPVENDOR', get_option('app_vendor'))
+conf_data.set('LUACONSOLE', lua_variant != 'none' ? 'true' : 'false')
 
 data_files = []
 

src/Config.template.h

@@ -2,7 +2,6 @@
 #include <cstdint>
 
 // Boolean macros (defined / not defined), would be great to get rid of them all.
-#mesondefine LUACONSOLE
 #mesondefine NOHTTP
 #mesondefine GRAVFFT
 #mesondefine RENDERER
@@ -17,6 +16,7 @@
 #mesondefine MACOSX
 #mesondefine X86
 
+constexpr bool LUACONSOLE               = @LUACONSOLE@;
 constexpr bool ALLOW_FAKE_NEWER_VERSION = @ALLOW_FAKE_NEWER_VERSION@;
 constexpr bool USE_UPDATESERVER         = @USE_UPDATESERVER@;
 constexpr bool INSTALL_CHECK            = @INSTALL_CHECK@;

src/config/font/meson.build

@@ -1,7 +1,6 @@
 font_conf_data = conf_data
 font_conf_data.set('FONTEDITOR', true)
 font_conf_data.set('RENDERER', false)
-font_conf_data.set('LUACONSOLE', false)
 font_conf_data.set('NOHTTP', true)
 font_conf_data.set('GRAVFFT', false)
 configure_file(

src/config/powder/meson.build

@@ -1,7 +1,6 @@
 powder_conf_data = conf_data
 powder_conf_data.set('FONTEDITOR', false)
 powder_conf_data.set('RENDERER', false)
-powder_conf_data.set('LUACONSOLE', lua_variant != 'none')
 powder_conf_data.set('NOHTTP', not enable_http)
 powder_conf_data.set('GRAVFFT', enable_gravfft)
 configure_file(

src/config/render/meson.build

@@ -1,7 +1,6 @@
 render_conf_data = conf_data
 render_conf_data.set('FONTEDITOR', false)
 render_conf_data.set('RENDERER', true)
-render_conf_data.set('LUACONSOLE', false)
 render_conf_data.set('NOHTTP', true)
 render_conf_data.set('GRAVFFT', false)
 configure_file(

src/gui/game/IntroText.h

@@ -41,9 +41,10 @@ inline ByteString IntroText()
 #elif defined(MOD)
 	sb << " MODVER " << SNAPSHOT_ID;
 #endif
-#ifdef LUACONSOLE
-	sb << " LUACONSOLE";
-#endif
+	if constexpr (LUACONSOLE)
+	{
+		sb << " LUACONSOLE";
+	}
 #ifdef GRAVFFT
 	sb << " GRAVFFT";
 #endif

src/lua/LegacyLuaAPI.cpp

@@ -1,6 +1,4 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "client/http/Request.h" // includes curl.h, needs to come first to silence a warning on windows
 
 #include <iomanip>
@@ -1369,5 +1367,3 @@ int luatpt_perfectCircle(lua_State* l)
 	luacon_model->SetPerfectCircle(lua_toboolean(l, 1));
 	return 0;
 }
-
-#endif

src/lua/LuaBit.cpp

@@ -1,5 +1,3 @@
-#include "Config.h"
-#ifdef LUACONSOLE
 /*
 ** Lua BitOp -- a bit operations library for Lua 5.1/5.2.
 ** http://bitop.luajit.org/
@@ -189,4 +187,3 @@ int luaopen_bit(lua_State *L)
 //#endif
   return 1;
 }
-#endif

src/lua/LuaButton.cpp

@@ -1,10 +1,6 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaButton.h"
-
 #include "LuaScriptInterface.h"
-
 #include "gui/interface/Button.h"
 
 const char LuaButton::className[] = "Button";
@@ -88,4 +84,3 @@ void LuaButton::triggerAction()
 LuaButton::~LuaButton()
 {
 }
-#endif

src/lua/LuaCheckbox.cpp

@@ -1,10 +1,6 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaCheckbox.h"
-
 #include "LuaScriptInterface.h"
-
 #include "gui/interface/Checkbox.h"
 
 const char LuaCheckbox::className[] = "Checkbox";
@@ -87,4 +83,3 @@ void LuaCheckbox::triggerAction()
 LuaCheckbox::~LuaCheckbox()
 {
 }
-#endif

src/lua/LuaComponent.cpp

@@ -1,6 +1,4 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaComponent.h"
 
 #include "LuaScriptInterface.h"
@@ -94,4 +92,3 @@ LuaComponent::~LuaComponent()
 		delete component;
 	}
 }
-#endif

src/lua/LuaLabel.cpp

@@ -1,10 +1,6 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaScriptInterface.h"
-
 #include "LuaLabel.h"
-
 #include "gui/interface/Label.h"
 
 const char LuaLabel::className[] = "Label";
@@ -50,4 +46,3 @@ int LuaLabel::text(lua_State * l)
 LuaLabel::~LuaLabel()
 {
 }
-#endif

src/lua/LuaProgressBar.cpp

@@ -1,10 +1,6 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaProgressBar.h"
-
 #include "LuaScriptInterface.h"
-
 #include "gui/interface/ProgressBar.h"
 
 const char LuaProgressBar::className[] = "ProgressBar";
@@ -66,4 +62,3 @@ int LuaProgressBar::status(lua_State * l)
 LuaProgressBar::~LuaProgressBar()
 {
 }
-#endif

src/lua/LuaSlider.cpp

@@ -1,10 +1,6 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaSlider.h"
-
 #include "LuaScriptInterface.h"
-
 #include "gui/interface/Slider.h"
 
 const char LuaSlider::className[] = "Slider";
@@ -87,4 +83,3 @@ void LuaSlider::triggerOnValueChanged()
 LuaSlider::~LuaSlider()
 {
 }
-#endif

src/lua/LuaSmartRef.cpp

@@ -1,5 +1,4 @@
 #include "Config.h"
-#ifdef LUACONSOLE
 #include "LuaSmartRef.h"
 
 void LuaSmartRef::Clear()
@@ -37,5 +36,3 @@ int LuaSmartRef::Push(lua_State *l)
 	lua_rawgeti(l, LUA_REGISTRYINDEX, ref);
 	return lua_type(l, -1);
 }
-
-#endif

src/lua/LuaTextbox.cpp

@@ -1,10 +1,6 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaTextbox.h"
-
 #include "LuaScriptInterface.h"
-
 #include "gui/interface/Textbox.h"
 
 const char LuaTextbox::className[] = "Textbox";
@@ -90,4 +86,3 @@ int LuaTextbox::text(lua_State * l)
 LuaTextbox::~LuaTextbox()
 {
 }
-#endif

src/lua/LuaWindow.cpp

@@ -1,6 +1,4 @@
 #include "Config.h"
-#ifdef LUACONSOLE
-
 #include "LuaWindow.h"
 
 #include "LuaScriptInterface.h"
@@ -511,4 +509,3 @@ LuaWindow::~LuaWindow()
 	window->CloseActiveWindow();
 	delete window;
 }
-#endif