Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpi target was not used, but regular linux one anyway

Browse Source
This commit is contained in:
Miodrag Milanovic 2021-10-26 10:50:09 +02:00
parent 60aed0ed6b
commit 1a79bb82b1
6 changed files with 2 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
makefile
View File

@ -1608,30 +1608,6 @@ openbsd_x86: generate $(PROJECTDIR)/$(MAKETYPE)-openbsd/Makefile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-openbsd config=$(CONFIG)32 precompile
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-openbsd config=$(CONFIG)32
#-------------------------------------------------
# gmake-rpi
#-------------------------------------------------
$(PROJECTDIR_SDL)/$(MAKETYPE)-rpi/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef RASPBERRY_SDK_PATH
$(error RASPBERRY_SDK_PATH is not set)
endif
ifndef RASPBERRY_SYSROOT
$(error RASPBERRY_SYSROOT is not set)
endif
$(SILENT) $(GENIE) $(PARAMS) --gcc=rpi --gcc_version=4.9.2 --osd=sdl --targetos=rpi --targetos=rpi --NO_USE_MIDI=1 --PLATFORM=arm --NOASM=1 --USE_QTDEBUG=0 --SDL_INSTALL_ROOT=$(RASPBERRY_SYSROOT)/usr $(MAKETYPE)
.PHONY: rpi
rpi: generate $(PROJECTDIR_SDL)/$(MAKETYPE)-rpi/Makefile
ifndef RASPBERRY_SDK_PATH
$(error RASPBERRY_SDK_PATH is not set)
endif
ifndef RASPBERRY_SYSROOT
$(error RASPBERRY_SYSROOT is not set)
endif
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-rpi config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/$(MAKETYPE)-rpi config=$(CONFIG)
#-------------------------------------------------
# Clean/bootstrap
#-------------------------------------------------

17
scripts/genie.lua
View File

@ -150,7 +150,6 @@ newoption {
{ "windows", "Windows" },
{ "haiku", "Haiku" },
{ "solaris", "Solaris SunOS" },
{ "rpi", "Raspberry Pi" },
},
}
@ -1223,7 +1222,7 @@ configuration { "android-arm64" }
"-Wno-asm-operand-widths",
}
configuration { "linux-* or rpi"}
configuration { "linux-*"}
links {
"dl",
"rt",
@ -1237,20 +1236,6 @@ configuration { "linux-* or rpi"}
configuration { "rpi" }
links {
"SDL2",
"fontconfig",
"X11",
"GLESv2",
"EGL",
"bcm_host",
"vcos",
"vchiq_arm",
"pthread",
}
configuration { "osx* or xcode4" }
links {
"pthread",

8
scripts/src/3rdparty.lua
View File

@ -1350,14 +1350,6 @@ end
"-Wno-unused-function",
"-Wno-unused-variable",
}
configuration { "rpi" }
buildoptions {
"-Wno-unused-but-set-variable",
"-Wno-unused-variable",
}
defines {
"__STDC_VERSION__=199901L",
}
configuration { }

3
scripts/src/main.lua
View File

@ -104,9 +104,6 @@ end
configuration { "mingw*" or "vs20*" }
targetextension ".exe"
configuration { "rpi" }
targetextension ""
configuration { "asmjs" }
targetextension ".bc"
if os.getenv("EMSCRIPTEN") then

4
scripts/src/tests.lua
View File

@ -36,10 +36,6 @@ project("mametests")
configuration { "mingw*" or "vs*" }
targetextension ".exe"
configuration { "rpi" }
targetextension ""
configuration { }
links {

52
scripts/toolchain.lua
View File

@ -36,7 +36,6 @@ newoption {
{ "openbsd", "OpenBSD" },
{ "osx", "OSX (GCC compiler)" },
{ "osx-clang", "OSX (Clang compiler)" },
{ "rpi", "RaspberryPi" },
{ "solaris", "Solaris" },
},
}
@ -220,16 +219,6 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux-clang")
end
if "rpi" == _OPTIONS["gcc"] then
if not os.getenv("RASPBERRY_SDK_PATH") then
print("Set RASPBERRY_SDK_PATH envrionment variable.")
end
premake.gcc.cc = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-gcc"
premake.gcc.cxx = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-g++"
premake.gcc.ar = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
end
if "mingw32-gcc" == _OPTIONS["gcc"] then
if not os.getenv("MINGW32") then
print("Set MINGW32 envrionment variable.")
@ -279,10 +268,6 @@ function toolchain(_buildDir, _subDir)
premake.gcc.ar = toolchainPrefix .. "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
end
if "rpi" == _OPTIONS["gcc"] then
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
end
elseif _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
@ -533,37 +518,6 @@ function toolchain(_buildDir, _subDir)
configuration { "x64", "mingw64-gcc", "Debug" }
targetdir (_buildDir .. "mingw-gcc" .. "/bin/x64/Debug")
configuration { "rpi" }
objdir ( _buildDir .. "rpi/obj")
libdirs {
"$(RASPBERRY_SYSROOT)/opt/vc/lib",
}
includedirs {
"$(RASPBERRY_SYSROOT)/opt/vc/include",
"$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vcos/pthreads",
"$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vmcs_host/linux",
}
defines {
"__VCCOREVER__=0x04000000", -- There is no special prefedined compiler symbol to detect RaspberryPi, faking it.
}
linkoptions {
"-Wl,--gc-sections",
}
buildoptions {
"--sysroot=$(RASPBERRY_SYSROOT)",
}
linkoptions {
"-static-libgcc",
"-static-libstdc++",
"--sysroot=$(RASPBERRY_SYSROOT)",
}
configuration { "rpi", "Release" }
targetdir (_buildDir .. "rpi/bin/Release")
configuration { "rpi", "Debug" }
targetdir (_buildDir .. "rpi/bin/Debug")
configuration { "mingw-clang" }
buildoptions {
"-femulated-tls",
@ -940,10 +894,6 @@ function toolchain(_buildDir, _subDir)
targetdir (_buildDir .. "ios-simulator" .. "/bin")
objdir (_buildDir .. "ios-simulator" .. "/obj")
configuration { "rpi" }
targetdir (_buildDir .. "rpi" .. "/bin")
objdir (_buildDir .. "rpi" .. "/obj")
configuration {} -- reset configuration
return true
@ -966,7 +916,7 @@ function strip()
"$(SILENT) " .. toolchainPrefix .. "strip -s \"$(TARGET)\""
}
configuration { "linux-* or rpi" }
configuration { "linux-*" }
postbuildcommands {
"$(SILENT) echo Stripping symbols.",
"$(SILENT) strip -s \"$(TARGET)\""