cleanup build includes (nw)

3rdparty/libjpeg/jpeglib.h

@@ -11,13 +11,6 @@
  * and perhaps jerror.h if they want to know the exact error codes.
  */
 
-#ifdef USE_SYSTEM_JPEGLIB
-#ifndef XMD_H
-#define XMD_H
-#endif
-#include <jpeglib.h>
-#else
-
 #ifndef JPEGLIB_H
 #define JPEGLIB_H
 
@@ -1165,4 +1158,3 @@ struct jpeg_color_quantizer { long dummy; };
 #endif
 
 #endif /* JPEGLIB_H */
-#endif /* USE_SYSTEM_JPEGLIB */

3rdparty/lsqlite3/lsqlite3.c

@@ -31,8 +31,8 @@
 #include <assert.h>
 
 #define LUA_LIB
-#include "lua.h"
+#include <lua.h>
-#include "lauxlib.h"
+#include <lauxlib.h>
 
 #if LUA_VERSION_NUM > 501
 //

scripts/genie.lua

@@ -366,7 +366,7 @@ newoption {
 	}
 }
 
-dofile("extlib.lua")
+dofile ("extlib.lua")
 
 if _OPTIONS["SHLIB"]=="1" then
 	LIBTYPE = "SharedLib"
@@ -622,30 +622,17 @@ else
 	end
 end
 
--- need to ensure FLAC functions are statically linked
+if _OPTIONS["with-system-jpeg"]~=nil then
-if not _OPTIONS["with-system-flac"] then
+	defines {
+		"XMD_H",
+	}
+end
+
+if _OPTIONS["with-system-flac"]~=nil then
 	defines {
 		"FLAC__NO_DLL",
 	}
-	end
+end
-
-if _OPTIONS["with-system-jpeg"] then
-	defines {
-		"USE_SYSTEM_JPEGLIB",
-	}
-	end
-
-if _OPTIONS["with-system-portmidi"] then
-	defines {
-		"USE_SYSTEM_PORTMIDI",
-	}
-	end
-
-if _OPTIONS["with-system-sqlite3"] then
-	defines {
-		"USE_SYSTEM_SQLITE",
-	}
-	end
 
 if _OPTIONS["NOASM"]=="1" then
 	defines {
@@ -667,11 +654,6 @@ if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
 	end
 end
 
--- define USE_SYSTEM_JPEGLIB if library shipped with MAME is not used
---ifneq ($(BUILD_JPEGLIB),1)
---DEFS += -DUSE_SYSTEM_JPEGLIB
---endif
-
 	defines {
 		"LUA_COMPAT_ALL",
 		"LUA_COMPAT_5_1",

src/emu/luaengine.cpp

@@ -10,7 +10,7 @@
 
 #include <limits>
 #include <thread>
-#include "lua.hpp"
+#include <lua.hpp>
 #include "luabridge/Source/LuaBridge/LuaBridge.h"
 #include <signal.h>
 #include "emu.h"

src/lib/util/flac.h

@@ -16,11 +16,7 @@
 #include "osdcore.h"
 #include "corefile.h"
 
-#ifdef FLAC__NO_DLL
-#include "libflac/include/FLAC/all.h"
-#else
 #include <FLAC/all.h>
-#endif
 
 
 //**************************************************************************

src/osd/modules/midi/portmidi.cpp

@@ -10,11 +10,7 @@
 
 #ifndef NO_USE_MIDI
 
-#ifndef USE_SYSTEM_PORTMIDI
-#include "portmidi/pm_common/portmidi.h"
-#else
 #include <portmidi.h>
-#endif
 #include "osdcore.h"
 #include "corealloc.h"
 #include "modules/osdmodule.h"