Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

build into OSD subdirectory for people building multiple OSDs

Browse Source
This commit is contained in:
Vas Crabb 2015-03-28 16:06:06 +11:00
parent eca145893d
commit a9bc80bd4b
3 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/genie.lua
View File

@ -588,7 +588,7 @@ else
subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"] .. _OPTIONS["subtarget"] subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"] .. _OPTIONS["subtarget"]
end end
if not toolchain(MAME_BUILD_DIR, subdir) then if not toolchain(_OPTIONS["osd"], MAME_BUILD_DIR, subdir) then
return -- no action specified return -- no action specified
end end

2
scripts/src/osd/sdl.lua
View File

@ -25,6 +25,8 @@ configuration { "mingw*" }
"oleaut32", "oleaut32",
} }
configuration { }
project ("osd_" .. _OPTIONS["osd"]) project ("osd_" .. _OPTIONS["osd"])
uuid (os.uuid("osd_" .. _OPTIONS["osd"])) uuid (os.uuid("osd_" .. _OPTIONS["osd"]))

114
scripts/toolchain.lua
View File

@ -60,7 +60,7 @@ newoption {
description = "Set iOS target version (default: 8.0).", description = "Set iOS target version (default: 8.0).",
} }
function toolchain(_buildDir, _subDir) function toolchain(_osd, _buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION)
@ -352,37 +352,37 @@ function toolchain(_buildDir, _subDir)
configuration { "x32", "vs*" } configuration { "x32", "vs*" }
targetdir (_buildDir .. "win32_" .. _ACTION .. "/bin") targetdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "/bin")
objdir (_buildDir .. "win32_" .. _ACTION .. "/obj") objdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "/obj")
configuration { "x64", "vs*" } configuration { "x64", "vs*" }
defines { "_WIN64" } defines { "_WIN64" }
targetdir (_buildDir .. "win64_" .. _ACTION .. "/bin") targetdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "/bin")
objdir (_buildDir .. "win64_" .. _ACTION .. "/obj") objdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "/obj")
configuration { "ARM", "vs*" } configuration { "ARM", "vs*" }
targetdir (_buildDir .. "arm_" .. _ACTION .. "/bin") targetdir (_buildDir .. _osd .. "/arm_" .. _ACTION .. "/bin")
objdir (_buildDir .. "arm_" .. _ACTION .. "/obj") objdir (_buildDir .. _osd .. "/arm_" .. _ACTION .. "/obj")
configuration { "x32", "vs*-clang" } configuration { "x32", "vs*-clang" }
targetdir (_buildDir .. "win32_" .. _ACTION .. "-clang/bin") targetdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "-clang/bin")
objdir (_buildDir .. "win32_" .. _ACTION .. "-clang/obj") objdir (_buildDir .. _osd .. "/win32_" .. _ACTION .. "-clang/obj")
configuration { "x64", "vs*-clang" } configuration { "x64", "vs*-clang" }
targetdir (_buildDir .. "win64_" .. _ACTION .. "-clang/bin") targetdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "-clang/bin")
objdir (_buildDir .. "win64_" .. _ACTION .. "-clang/obj") objdir (_buildDir .. _osd .. "/win64_" .. _ACTION .. "-clang/obj")
configuration { "mingw*" } configuration { "mingw*" }
defines { "WIN32" } defines { "WIN32" }
configuration { "x32", "mingw32-gcc" } configuration { "x32", "mingw32-gcc" }
targetdir (_buildDir .. "win32_mingw-gcc" .. "/bin") targetdir (_buildDir .. _osd .. "/win32_mingw-gcc" .. "/bin")
objdir (_buildDir .. "win32_mingw-gcc" .. "/obj") objdir (_buildDir .. _osd .. "/win32_mingw-gcc" .. "/obj")
buildoptions { "-m32" } buildoptions { "-m32" }
configuration { "x64", "mingw64-gcc" } configuration { "x64", "mingw64-gcc" }
targetdir (_buildDir .. "win64_mingw-gcc" .. "/bin") targetdir (_buildDir .. _osd .. "/win64_mingw-gcc" .. "/bin")
objdir (_buildDir .. "win64_mingw-gcc" .. "/obj") objdir (_buildDir .. _osd .. "/win64_mingw-gcc" .. "/obj")
buildoptions { "-m64" } buildoptions { "-m64" }
configuration { "mingw-clang" } configuration { "mingw-clang" }
@ -392,8 +392,8 @@ function toolchain(_buildDir, _subDir)
} }
configuration { "x32", "mingw-clang" } configuration { "x32", "mingw-clang" }
targetdir (_buildDir .. "win32_mingw-clang/bin") targetdir (_buildDir .. _osd .. "/win32_mingw-clang/bin")
objdir ( _buildDir .. "win32_mingw-clang/obj") objdir ( _buildDir .. _osd .. "/win32_mingw-clang/obj")
buildoptions { "-m32" } buildoptions { "-m32" }
buildoptions { buildoptions {
"-isystem$(MINGW32)/i686-w64-mingw32/include/c++", "-isystem$(MINGW32)/i686-w64-mingw32/include/c++",
@ -402,8 +402,8 @@ function toolchain(_buildDir, _subDir)
} }
configuration { "x64", "mingw-clang" } configuration { "x64", "mingw-clang" }
targetdir (_buildDir .. "win64_mingw-clang/bin") targetdir (_buildDir .. _osd .. "/win64_mingw-clang/bin")
objdir (_buildDir .. "win64_mingw-clang/obj") objdir (_buildDir .. _osd .. "/win64_mingw-clang/obj")
buildoptions { "-m64" } buildoptions { "-m64" }
buildoptions { buildoptions {
"-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++", "-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++",
@ -412,29 +412,29 @@ function toolchain(_buildDir, _subDir)
} }
configuration { "linux-gcc", "x32" } configuration { "linux-gcc", "x32" }
targetdir (_buildDir .. "linux32_gcc" .. "/bin") targetdir (_buildDir .. _osd .. "/linux32_gcc" .. "/bin")
objdir (_buildDir .. "linux32_gcc" .. "/obj") objdir (_buildDir .. _osd .. "/linux32_gcc" .. "/obj")
buildoptions { buildoptions {
"-m32", "-m32",
} }
configuration { "linux-gcc", "x64" } configuration { "linux-gcc", "x64" }
targetdir (_buildDir .. "linux64_gcc" .. "/bin") targetdir (_buildDir .. _osd .. "/linux64_gcc" .. "/bin")
objdir (_buildDir .. "linux64_gcc" .. "/obj") objdir (_buildDir .. _osd .. "/linux64_gcc" .. "/obj")
buildoptions { buildoptions {
"-m64", "-m64",
} }
configuration { "linux-clang", "x32" } configuration { "linux-clang", "x32" }
targetdir (_buildDir .. "linux32_clang" .. "/bin") targetdir (_buildDir .. _osd .. "/linux32_clang" .. "/bin")
objdir (_buildDir .. "linux32_clang" .. "/obj") objdir (_buildDir .. _osd .. "/linux32_clang" .. "/obj")
buildoptions { buildoptions {
"-m32", "-m32",
} }
configuration { "linux-clang", "x64" } configuration { "linux-clang", "x64" }
targetdir (_buildDir .. "linux64_clang" .. "/bin") targetdir (_buildDir .. _osd .. "/linux64_clang" .. "/bin")
objdir (_buildDir .. "linux64_clang" .. "/obj") objdir (_buildDir .. _osd .. "/linux64_clang" .. "/obj")
buildoptions { buildoptions {
"-m64", "-m64",
} }
@ -481,8 +481,8 @@ function toolchain(_buildDir, _subDir)
configuration { "android-arm" } configuration { "android-arm" }
targetdir (_buildDir .. "android-arm" .. "/bin") targetdir (_buildDir .. _osd .. "/android-arm" .. "/bin")
objdir (_buildDir .. "android-arm" .. "/obj") objdir (_buildDir .. _osd .. "/android-arm" .. "/obj")
libdirs { libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a",
} }
@ -507,8 +507,8 @@ function toolchain(_buildDir, _subDir)
} }
configuration { "android-mips" } configuration { "android-mips" }
targetdir (_buildDir .. "android-mips" .. "/bin") targetdir (_buildDir .. _osd .. "/android-mips" .. "/bin")
objdir (_buildDir .. "android-mips" .. "/obj") objdir (_buildDir .. _osd .. "/android-mips" .. "/obj")
libdirs { libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips",
} }
@ -527,8 +527,8 @@ function toolchain(_buildDir, _subDir)
} }
configuration { "android-x86" } configuration { "android-x86" }
targetdir (_buildDir .. "android-x86" .. "/bin") targetdir (_buildDir .. _osd .. "/android-x86" .. "/bin")
objdir (_buildDir .. "android-x86" .. "/obj") objdir (_buildDir .. _osd .. "/android-x86" .. "/obj")
libdirs { libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86",
} }
@ -553,8 +553,8 @@ function toolchain(_buildDir, _subDir)
configuration { "asmjs" } configuration { "asmjs" }
targetdir (_buildDir .. "asmjs" .. "/bin") targetdir (_buildDir .. _osd .. "/asmjs" .. "/bin")
objdir (_buildDir .. "asmjs" .. "/obj") objdir (_buildDir .. _osd .. "/asmjs" .. "/obj")
buildoptions { buildoptions {
"-isystem$(EMSCRIPTEN)/system/include", "-isystem$(EMSCRIPTEN)/system/include",
"-isystem$(EMSCRIPTEN)/system/include/compat", "-isystem$(EMSCRIPTEN)/system/include/compat",
@ -571,8 +571,8 @@ function toolchain(_buildDir, _subDir)
} }
configuration { "freebsd" } configuration { "freebsd" }
targetdir (_buildDir .. "freebsd" .. "/bin") targetdir (_buildDir .. _osd .. "/freebsd" .. "/bin")
objdir (_buildDir .. "freebsd" .. "/obj") objdir (_buildDir .. _osd .. "/freebsd" .. "/obj")
configuration { "nacl or nacl-arm or pnacl" } configuration { "nacl or nacl-arm or pnacl" }
buildoptions { buildoptions {
@ -600,8 +600,8 @@ function toolchain(_buildDir, _subDir)
} }
configuration { "x32", "nacl" } configuration { "x32", "nacl" }
targetdir (_buildDir .. "nacl-x86" .. "/bin") targetdir (_buildDir .. _osd .. "/nacl-x86" .. "/bin")
objdir (_buildDir .. "nacl-x86" .. "/obj") objdir (_buildDir .. _osd .. "/nacl-x86" .. "/obj")
configuration { "x32", "nacl", "Debug" } configuration { "x32", "nacl", "Debug" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Debug" } libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Debug" }
@ -610,8 +610,8 @@ function toolchain(_buildDir, _subDir)
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Release" } libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Release" }
configuration { "x64", "nacl" } configuration { "x64", "nacl" }
targetdir (_buildDir .. "nacl-x64" .. "/bin") targetdir (_buildDir .. _osd .. "/nacl-x64" .. "/bin")
objdir (_buildDir .. "nacl-x64" .. "/obj") objdir (_buildDir .. _osd .. "/nacl-x64" .. "/obj")
configuration { "x64", "nacl", "Debug" } configuration { "x64", "nacl", "Debug" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Debug" } libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Debug" }
@ -620,8 +620,8 @@ function toolchain(_buildDir, _subDir)
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Release" } libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Release" }
configuration { "nacl-arm" } configuration { "nacl-arm" }
targetdir (_buildDir .. "nacl-arm" .. "/bin") targetdir (_buildDir .. _osd .. "/nacl-arm" .. "/bin")
objdir (_buildDir .. "nacl-arm" .. "/obj") objdir (_buildDir .. _osd .. "/nacl-arm" .. "/obj")
configuration { "nacl-arm", "Debug" } configuration { "nacl-arm", "Debug" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Debug" } libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Debug" }
@ -630,8 +630,8 @@ function toolchain(_buildDir, _subDir)
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Release" } libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Release" }
configuration { "pnacl" } configuration { "pnacl" }
targetdir (_buildDir .. "pnacl" .. "/bin") targetdir (_buildDir .. _osd .. "/pnacl" .. "/bin")
objdir (_buildDir .. "pnacl" .. "/obj") objdir (_buildDir .. _osd .. "/pnacl" .. "/obj")
configuration { "pnacl", "Debug" } configuration { "pnacl", "Debug" }
libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Debug" } libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Debug" }
@ -640,34 +640,34 @@ function toolchain(_buildDir, _subDir)
libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" } libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" }
configuration { "osx*", "x32" } configuration { "osx*", "x32" }
targetdir (_buildDir .. "osx32_clang" .. "/bin") targetdir (_buildDir .. _osd .. "/osx32_clang" .. "/bin")
objdir (_buildDir .. "osx32_clang" .. "/obj") objdir (_buildDir .. _osd .. "/osx32_clang" .. "/obj")
buildoptions { buildoptions {
"-m32", "-m32",
} }
configuration { "osx*", "x64" } configuration { "osx*", "x64" }
targetdir (_buildDir .. "osx64_clang" .. "/bin") targetdir (_buildDir .. _osd .. "/osx64_clang" .. "/bin")
objdir (_buildDir .. "osx64_clang" .. "/obj") objdir (_buildDir .. _osd .. "/osx64_clang" .. "/obj")
buildoptions { buildoptions {
"-m64", "-m64",
} }
configuration { "ios-arm" } configuration { "ios-arm" }
targetdir (_buildDir .. "ios-arm" .. "/bin") targetdir (_buildDir .. _osd .. "/ios-arm" .. "/bin")
objdir (_buildDir .. "ios-arm" .. "/obj") objdir (_buildDir .. _osd .. "/ios-arm" .. "/obj")
configuration { "ios-simulator" } configuration { "ios-simulator" }
targetdir (_buildDir .. "ios-simulator" .. "/bin") targetdir (_buildDir .. _osd .. "/ios-simulator" .. "/bin")
objdir (_buildDir .. "ios-simulator" .. "/obj") objdir (_buildDir .. _osd .. "/ios-simulator" .. "/obj")
configuration { "qnx-arm" } configuration { "qnx-arm" }
targetdir (_buildDir .. "qnx-arm" .. "/bin") targetdir (_buildDir .. _osd .. "/qnx-arm" .. "/bin")
objdir (_buildDir .. "qnx-arm" .. "/obj") objdir (_buildDir .. _osd .. "/qnx-arm" .. "/obj")
configuration { "rpi" } configuration { "rpi" }
targetdir (_buildDir .. "rpi" .. "/bin") targetdir (_buildDir .. _osd .. "/rpi" .. "/bin")
objdir (_buildDir .. "rpi" .. "/obj") objdir (_buildDir .. _osd .. "/rpi" .. "/obj")
configuration {} -- reset configuration configuration {} -- reset configuration