summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua8
-rw-r--r--scripts/src/3rdparty.lua11
-rw-r--r--scripts/src/main.lua6
-rw-r--r--scripts/toolchain.lua38
4 files changed, 54 insertions, 9 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 60539aca51b..e42c92bd455 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -80,6 +80,7 @@ newoption {
{ "windows", "Windows" },
{ "os2", "OS/2 eComStation" },
{ "haiku", "Haiku" },
+ { "solaris", "Solaris SunOS" },
},
}
@@ -767,9 +768,14 @@ end
-- warnings only applicable to C compiles
buildoptions_c {
"-Wpointer-arith",
- "-Wbad-function-cast",
"-Wstrict-prototypes",
}
+
+if _OPTIONS["targetos"]~="freebsd" then
+ buildoptions_c {
+ "-Wbad-function-cast",
+ }
+end
-- warnings only applicable to OBJ-C compiles
buildoptions_objc {
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 66e98be2a5f..22ef38f49a5 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -383,7 +383,7 @@ project "sqllite3"
--------------------------------------------------
-- portmidi library objects
--------------------------------------------------
-
+if _OPTIONS["NO_USE_MIDI"]=="0" then
project "portmidi"
uuid "587f2da6-3274-4a65-86a2-f13ea315bb98"
kind "StaticLib"
@@ -433,7 +433,7 @@ project "portmidi"
MAME_DIR .. "3rdparty/portmidi/porttime/ptmacosx_mach.c",
}
end
-
+end
--------------------------------------------------
-- BGFX library objects
--------------------------------------------------
@@ -464,7 +464,12 @@ project "bgfx"
includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/osx",
}
-
+
+ configuration { "freebsd" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
+ }
+
configuration { "gmake" }
buildoptions {
"-Wno-uninitialized",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 42bfe245537..8604987ffda 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -59,8 +59,12 @@ function mainProject(_target, _subtarget)
"zlib",
"jsoncpp",
"mongoose",
- "portmidi",
}
+ if _OPTIONS["NO_USE_MIDI"]=="0" then
+ links {
+ "portmidi",
+ }
+ end
if (USE_BGFX == 1) then
links {
"bgfx"
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 750d5ede955..7251a273ec6 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -29,6 +29,7 @@ newoption {
{ "pnacl", "Native Client - PNaCl" },
{ "qnx-arm", "QNX/Blackberry - ARM" },
{ "rpi", "RaspberryPi" },
+ { "solaris", "Solaris" },
},
}
@@ -168,6 +169,11 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux")
end
+ if "solaris" == _OPTIONS["gcc"] then
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-solaris")
+ end
+
+
if "linux-clang" == _OPTIONS["gcc"] then
premake.gcc.cc = "clang"
premake.gcc.cxx = "clang++"
@@ -449,6 +455,34 @@ function toolchain(_buildDir, _subDir)
"-m64",
}
+ configuration { "solaris", "x32" }
+ targetdir (_buildDir .. "solaris" .. "/bin/x32")
+ objdir (_buildDir .. "solaris" .. "/obj")
+ buildoptions {
+ "-m32",
+ }
+
+ configuration { "solaris", "x64" }
+ targetdir (_buildDir .. "solaris" .. "/bin/x64")
+ objdir (_buildDir .. "solaris" .. "/obj")
+ buildoptions {
+ "-m64",
+ }
+
+ configuration { "freebsd", "x32" }
+ targetdir (_buildDir .. "freebsd" .. "/bin/x32")
+ objdir (_buildDir .. "freebsd" .. "/obj")
+ buildoptions {
+ "-m32",
+ }
+
+ configuration { "freebsd", "x64" }
+ targetdir (_buildDir .. "freebsd" .. "/bin/x64")
+ objdir (_buildDir .. "freebsd" .. "/obj")
+ buildoptions {
+ "-m64",
+ }
+
configuration { "android-*" }
includedirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/include",
@@ -580,10 +614,6 @@ function toolchain(_buildDir, _subDir)
"-Wno-extern-c-compat",
}
- configuration { "freebsd" }
- targetdir (_buildDir .. "freebsd" .. "/bin")
- objdir (_buildDir .. "freebsd" .. "/obj")
-
configuration { "nacl or nacl-arm or pnacl" }
buildoptions {
"-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,...