Fix lua=none builds

pch/pch_cpp.h

@@ -89,7 +89,7 @@
 #include <json/json.h>
 #include <zlib.h>
 
-#if !defined(FONTEDITOR) && !defined(RENDERER)
+#if !defined(FONTEDITOR) && !defined(RENDERER) && LUACONSOLE
 # include "lua/LuaCompat.h"
 #endif
 #include "SDLCompat.h"

src/gui/game/GameController.cpp

@@ -60,11 +60,11 @@
 #include "debug/ParticleDebug.h"
 
 #ifdef LUACONSOLE
-#include "lua/LuaScriptInterface.h"
+# include "lua/LuaScriptInterface.h"
+# include "lua/LuaEvents.h"
 #else
-#include "lua/TPTScriptInterface.h"
+# include "lua/TPTScriptInterface.h"
 #endif
-#include "lua/LuaEvents.h"
 
 #include "graphics/Renderer.h"
 

src/lua/LuaEvents.cpp

@@ -1,10 +1,9 @@
 #include "LuaEvents.h"
 #ifdef LUACONSOLE
-#include "LuaCompat.h"
-#include "LuaScriptInterface.h"
-
-#include "Platform.h"
-#include "gui/interface/Engine.h"
+# include "LuaCompat.h"
+# include "LuaScriptInterface.h"
+# include "Platform.h"
+# include "gui/interface/Engine.h"
 #endif
 
 void Event::PushInteger(lua_State * l, int num)

src/lua/meson.build

@@ -1,12 +1,10 @@
 luaconsole_files = files(
-	'CommandInterface.cpp',
 	'LegacyLuaAPI.cpp',
 	'LuaBit.cpp',
 	'LuaButton.cpp',
 	'LuaCheckbox.cpp',
 	'LuaCompat.c',
 	'LuaComponent.cpp',
-	'LuaEvents.cpp',
 	'LuaLabel.cpp',
 	'LuaProgressBar.cpp',
 	'LuaScriptInterface.cpp',
@@ -27,8 +25,6 @@ luaconsole_files = files(
 	'socket/tcp.c',
 	'socket/timeout.c',
 	'socket/udp.c',
-	'TPTScriptInterface.cpp',
-	'TPTSTypes.cpp',
 )
 
 subdir('luascripts')

src/meson.build

@@ -8,6 +8,10 @@ powder_files = files(
 	'SDLCompat.cpp',
 	'Update.cpp',
 	'PowderToySDL.cpp',
+	'lua/CommandInterface.cpp',
+	'lua/LuaEvents.cpp',
+	'lua/TPTScriptInterface.cpp',
+	'lua/TPTSTypes.cpp',
 )
 
 render_files = files(
@@ -32,7 +36,9 @@ subdir('debug')
 subdir('graphics')
 subdir('gui')
 subdir('json')
-subdir('lua')
+if uopt_lua != 'none'
+	subdir('lua')
+endif
 subdir('powdertoyjava')
 subdir('resampler')
 subdir('simulation')