Merge pull request #886 from fcambus/master

Allow building on OpenBSD
This commit is contained in:
Miodrag Milanović 2016-05-20 08:37:40 +02:00
commit 320da2d391
2 changed files with 51 additions and 0 deletions

View File

@ -366,6 +366,10 @@ ifeq ($(TARGETOS),netbsd)
OSD := sdl
endif
ifeq ($(TARGETOS),openbsd)
OSD := sdl
endif
ifeq ($(TARGETOS),solaris)
OSD := sdl
endif
@ -1329,6 +1333,26 @@ netbsd_x86: generate $(PROJECTDIR)/gmake-netbsd/Makefile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-netbsd config=$(CONFIG)32 precompile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-netbsd config=$(CONFIG)32
#-------------------------------------------------
# gmake-openbsd
#-------------------------------------------------
$(PROJECTDIR)/gmake-openbsd/Makefile: makefile $(SCRIPTS) $(GENIE)
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=openbsd --gcc_version=$(GCC_VERSION) gmake
.PHONY: openbsd_x64
openbsd_x64: generate $(PROJECTDIR)/gmake-openbsd/Makefile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-openbsd config=$(CONFIG)64 precompile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-openbsd config=$(CONFIG)64
.PHONY: openbsd
openbsd: openbsd_x86
.PHONY: openbsd_x86
openbsd_x86: generate $(PROJECTDIR)/gmake-openbsd/Makefile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-openbsd config=$(CONFIG)32 precompile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-openbsd config=$(CONFIG)32
#-------------------------------------------------
# gmake-steamlink
#-------------------------------------------------

View File

@ -31,6 +31,7 @@ newoption {
{ "mingw64-gcc", "MinGW64" },
{ "mingw-clang", "MinGW (clang compiler)" },
{ "netbsd", "NetBSD" },
{ "openbsd", "OpenBSD" },
{ "osx", "OSX (GCC compiler)" },
{ "osx-clang", "OSX (Clang compiler)" },
{ "pnacl", "Native Client - PNaCl" },
@ -211,6 +212,10 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd")
end
if "openbsd" == _OPTIONS["gcc"] then
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-openbsd")
end
if "ios-arm" == _OPTIONS["gcc"] then
premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
@ -785,6 +790,28 @@ function toolchain(_buildDir, _subDir)
configuration { "netbsd", "x64", "Debug" }
targetdir (_buildDir .. "netbsd" .. "/bin/x64/Debug")
configuration { "openbsd", "x32" }
objdir (_buildDir .. "openbsd" .. "/obj")
buildoptions {
"-m32",
}
configuration { "openbsd", "x32", "Release" }
targetdir (_buildDir .. "openbsd" .. "/bin/x32/Release")
configuration { "openbsd", "x32", "Debug" }
targetdir (_buildDir .. "openbsd" .. "/bin/x32/Debug")
configuration { "openbsd", "x64" }
objdir (_buildDir .. "openbsd" .. "/obj")
buildoptions {
"-m64",
}
configuration { "openbsd", "x64", "Release" }
targetdir (_buildDir .. "openbsd" .. "/bin/x64/Release")
configuration { "openbsd", "x64", "Debug" }
targetdir (_buildDir .. "openbsd" .. "/bin/x64/Debug")
configuration { "android-*" }
includedirs {
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",