summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-05-31 20:03:39 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-05-31 20:03:39 +0200
commitd04f92103486524953c8e1d5d6e2e5c1d782706c (patch)
treefadf6f85bb87f38df9dda3888b0f1891205506d7 /scripts
parent773febd6c0384922a8b283e51dd65d9bb6310d4e (diff)
removed not used libraries, and commented portaudio that will be used but no need for now (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/extlib.lua6
-rw-r--r--scripts/src/3rdparty.lua383
-rw-r--r--scripts/src/main.lua2
3 files changed, 150 insertions, 241 deletions
diff --git a/scripts/extlib.lua b/scripts/extlib.lua
index 9d60fe1dc2e..e4e3b7cce46 100644
--- a/scripts/extlib.lua
+++ b/scripts/extlib.lua
@@ -10,7 +10,6 @@ local extlibs = {
zlib = { "z", "3rdparty/zlib" },
jpeg = { "jpeg", "3rdparty/libjpeg" },
flac = { "FLAC", "3rdparty/libflac/include" },
- sqlite3 = { "sqlite3", "3rdparty/sqlite3" },
portmidi = { "portmidi", "3rdparty/portmidi/pm_common" },
portaudio = { "portaudio", "3rdparty/portaudio/include" },
lua = { "lua", "3rdparty/lua/src" },
@@ -39,11 +38,6 @@ newoption {
}
newoption {
- trigger = 'with-system-sqlite3',
- description = 'Use system SQLite library',
-}
-
-newoption {
trigger = 'with-system-portmidi',
description = 'Use system PortMidi library',
}
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 0a3a7be2a0f..0b1a44dae2f 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -439,7 +439,7 @@ project "lua"
-- uncomment the options below to
-- compile using c++. Do the same
- -- in lsqlite3.
+ -- in lualibs.
-- In addition comment out the "extern "C""
-- in lua.hpp and do the same in luaengine.c line 47
--options {
@@ -558,75 +558,14 @@ project "lualibs"
includedirs {
ext_includedir("lua"),
ext_includedir("zlib"),
- ext_includedir("sqlite3"),
}
files {
- MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c",
MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c",
}
--------------------------------------------------
--- SQLite3 library objects
---------------------------------------------------
-
-if not _OPTIONS["with-system-sqlite3"] then
-project "sqlite3"
- uuid "5cb3d495-57ed-461c-81e5-80dc0857517d"
- kind "StaticLib"
-
- configuration { "vs*" }
- buildoptions {
- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
- "/wd4127", -- warning C4127: conditional expression is constant
- "/wd4232", -- warning C4232: nonstandard extension used : 'xxx' : address of dllimport 'xxx' is not static, identity not guaranteed
- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
- "/wd4706", -- warning C4706: assignment within conditional expression
- }
-if _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- }
-end
- configuration { "pnacl" }
- defines {
- "SQLITE_OMIT_LOAD_EXTENSION",
- }
- configuration { "vs2015" }
- buildoptions {
- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
- }
-
-
- configuration { "gmake" }
- buildoptions_c {
- "-Wno-bad-function-cast",
- "-Wno-undef",
- }
-
- local version = str_to_version(_OPTIONS["gcc_version"])
- if _OPTIONS["gcc"]~=nil and not string.find(_OPTIONS["gcc"], "clang") then
- if (version >= 40800) then
- buildoptions_c {
- "-Wno-array-bounds",
- }
- end
- end
-
- configuration { }
-
- files {
- MAME_DIR .. "3rdparty/sqlite3/sqlite3.c",
- }
-else
-links {
- ext_lib("sqlite3"),
-}
-end
-
---------------------------------------------------
-- portmidi library objects
--------------------------------------------------
if _OPTIONS["NO_USE_MIDI"]~="1" then
@@ -878,155 +817,155 @@ end
--------------------------------------------------
-- PortAudio library objects
--------------------------------------------------
-
-if not _OPTIONS["with-system-portaudio"] then
-project "portaudio"
- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
- kind "StaticLib"
-
- configuration { "vs*" }
- buildoptions {
- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch
- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
- "/wd4127", -- warning C4127: conditional expression is constant
- }
-if _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
- "/Qwd2544", -- message #2544: empty dependent statement in if-statement
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- }
-end
- configuration { "vs2015" }
- buildoptions {
- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
- }
-
- configuration { "gmake" }
- buildoptions_c {
- "-Wno-strict-prototypes",
- "-Wno-bad-function-cast",
- "-Wno-undef",
- "-Wno-missing-braces",
- "-Wno-unused-variable",
- "-Wno-unused-value",
- "-Wno-unused-function",
- "-Wno-unknown-pragmas",
- }
-
- local version = str_to_version(_OPTIONS["gcc_version"])
- if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
- buildoptions_c {
- "-Wno-unknown-warning-option",
- "-Wno-absolute-value",
- "-Wno-unused-but-set-variable",
- "-Wno-maybe-uninitialized",
- "-Wno-sometimes-uninitialized",
- }
- else
- if (version >= 40600) then
- buildoptions_c {
- "-Wno-unused-but-set-variable",
- "-Wno-maybe-uninitialized",
- "-Wno-sometimes-uninitialized",
- }
- end
- end
- end
- configuration { "vs*" }
- buildoptions {
- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
- }
-
- configuration { }
-
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/include",
- MAME_DIR .. "3rdparty/portaudio/src/common",
- }
-
- files {
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
- }
-
- if _OPTIONS["targetos"]=="windows" then
- defines {
- "PA_USE_DS=1",
- "PA_USE_WDMKS=1",
- "PA_USE_WMME=1",
- }
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/src/os/win",
- }
-
- configuration { }
- files {
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c",
- }
-
- end
- if _OPTIONS["targetos"]=="linux" then
- defines {
- "PA_USE_ALSA=1",
- "PA_USE_OSS=1",
- "HAVE_LINUX_SOUNDCARD_H",
- }
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
- }
- files {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c",
- }
- end
- if _OPTIONS["targetos"]=="macosx" then
- defines {
- "PA_USE_COREAUDIO=1",
- }
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
- }
- files {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
- }
- end
-
-else
-links {
- ext_lib("portaudio"),
-}
-end
+--
+--if not _OPTIONS["with-system-portaudio"] then
+--project "portaudio"
+-- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
+-- kind "StaticLib"
+--
+-- configuration { "vs*" }
+-- buildoptions {
+-- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
+-- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
+-- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
+-- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch
+-- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
+-- "/wd4127", -- warning C4127: conditional expression is constant
+-- }
+--if _OPTIONS["vs"]=="intel-15" then
+-- buildoptions {
+-- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+-- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
+-- "/Qwd2544", -- message #2544: empty dependent statement in if-statement
+-- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
+-- }
+--end
+-- configuration { "vs2015" }
+-- buildoptions {
+-- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
+-- }
+--
+-- configuration { "gmake" }
+-- buildoptions_c {
+-- "-Wno-strict-prototypes",
+-- "-Wno-bad-function-cast",
+-- "-Wno-undef",
+-- "-Wno-missing-braces",
+-- "-Wno-unused-variable",
+-- "-Wno-unused-value",
+-- "-Wno-unused-function",
+-- "-Wno-unknown-pragmas",
+-- }
+--
+-- local version = str_to_version(_OPTIONS["gcc_version"])
+-- if (_OPTIONS["gcc"]~=nil) then
+-- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
+-- buildoptions_c {
+-- "-Wno-unknown-warning-option",
+-- "-Wno-absolute-value",
+-- "-Wno-unused-but-set-variable",
+-- "-Wno-maybe-uninitialized",
+-- "-Wno-sometimes-uninitialized",
+-- }
+-- else
+-- if (version >= 40600) then
+-- buildoptions_c {
+-- "-Wno-unused-but-set-variable",
+-- "-Wno-maybe-uninitialized",
+-- "-Wno-sometimes-uninitialized",
+-- }
+-- end
+-- end
+-- end
+-- configuration { "vs*" }
+-- buildoptions {
+-- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
+-- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
+-- }
+--
+-- configuration { }
+--
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/include",
+-- MAME_DIR .. "3rdparty/portaudio/src/common",
+-- }
+--
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
+-- }
+--
+-- if _OPTIONS["targetos"]=="windows" then
+-- defines {
+-- "PA_USE_DS=1",
+-- "PA_USE_WDMKS=1",
+-- "PA_USE_WMME=1",
+-- }
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win",
+-- }
+--
+-- configuration { }
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c",
+-- }
+--
+-- end
+-- if _OPTIONS["targetos"]=="linux" then
+-- defines {
+-- "PA_USE_ALSA=1",
+-- "PA_USE_OSS=1",
+-- "HAVE_LINUX_SOUNDCARD_H",
+-- }
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+-- }
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c",
+-- }
+-- end
+-- if _OPTIONS["targetos"]=="macosx" then
+-- defines {
+-- "PA_USE_COREAUDIO=1",
+-- }
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+-- }
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+-- }
+-- end
+--
+--else
+--links {
+-- ext_lib("portaudio"),
+--}
+--end
--------------------------------------------------
-- libuv library objects
@@ -1232,29 +1171,7 @@ project "uv"
}
end
end
---------------------------------------------------
--- HTTP parser library objects
---------------------------------------------------
-
-project "http-parser"
- uuid "90c6ba59-bdb2-4fee-8b44-57601d690e14"
- kind "StaticLib"
-
- configuration { }
-
- files {
- MAME_DIR .. "3rdparty/http-parser/http_parser.c",
- }
- if (_OPTIONS["SHADOW_CHECK"]=="1") then
- removebuildoptions {
- "-Wshadow"
- }
- end
-else
-links {
- ext_lib("uv"),
-}
end
--------------------------------------------------
-- SDL2 library
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 50469f0e384..dd6cd80f2e2 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -231,13 +231,11 @@ end
if _OPTIONS["USE_LIBUV"]=="1" then
links {
ext_lib("uv"),
- "http-parser",
}
end
links {
ext_lib("zlib"),
ext_lib("flac"),
- ext_lib("sqlite3"),
}
if _OPTIONS["NO_USE_MIDI"]~="1" then