mirror of
https://github.com/bkaradzic/bx.git
synced 2026-02-17 20:52:37 +01:00
Removed support for SteamLink (discontinued 11/2018).
This commit is contained in:
@@ -57,7 +57,6 @@
|
||||
#define BX_PLATFORM_OSX 0
|
||||
#define BX_PLATFORM_PS4 0
|
||||
#define BX_PLATFORM_RPI 0
|
||||
#define BX_PLATFORM_STEAMLINK 0
|
||||
#define BX_PLATFORM_WINDOWS 0
|
||||
#define BX_PLATFORM_WINRT 0
|
||||
#define BX_PLATFORM_XBOXONE 0
|
||||
@@ -184,10 +183,6 @@
|
||||
# include <sys/cdefs.h> // Defines __BIONIC__ and includes android/api-level.h
|
||||
# undef BX_PLATFORM_ANDROID
|
||||
# define BX_PLATFORM_ANDROID __ANDROID_API__
|
||||
#elif defined(__STEAMLINK__)
|
||||
// SteamLink compiler defines __linux__
|
||||
# undef BX_PLATFORM_STEAMLINK
|
||||
# define BX_PLATFORM_STEAMLINK 1
|
||||
#elif defined(__VCCOREVER__)
|
||||
// RaspberryPi compiler defines __linux__
|
||||
# undef BX_PLATFORM_RPI
|
||||
@@ -274,7 +269,6 @@
|
||||
|| BX_PLATFORM_OSX \
|
||||
|| BX_PLATFORM_PS4 \
|
||||
|| BX_PLATFORM_RPI \
|
||||
|| BX_PLATFORM_STEAMLINK \
|
||||
)
|
||||
|
||||
///
|
||||
@@ -290,7 +284,6 @@
|
||||
|| BX_PLATFORM_OSX \
|
||||
|| BX_PLATFORM_PS4 \
|
||||
|| BX_PLATFORM_RPI \
|
||||
|| BX_PLATFORM_STEAMLINK \
|
||||
|| BX_PLATFORM_WINDOWS \
|
||||
|| BX_PLATFORM_WINRT \
|
||||
|| BX_PLATFORM_XBOXONE \
|
||||
@@ -317,7 +310,6 @@
|
||||
///
|
||||
#define BX_PLATFORM_OS_EMBEDDED (0 \
|
||||
|| BX_PLATFORM_RPI \
|
||||
|| BX_PLATFORM_STEAMLINK \
|
||||
)
|
||||
|
||||
///
|
||||
@@ -390,8 +382,6 @@
|
||||
# define BX_PLATFORM_NAME "PlayStation 4"
|
||||
#elif BX_PLATFORM_RPI
|
||||
# define BX_PLATFORM_NAME "RaspberryPi"
|
||||
#elif BX_PLATFORM_STEAMLINK
|
||||
# define BX_PLATFORM_NAME "SteamLink"
|
||||
#elif BX_PLATFORM_WINDOWS
|
||||
# define BX_PLATFORM_NAME "Windows"
|
||||
#elif BX_PLATFORM_WINRT
|
||||
|
||||
@@ -331,16 +331,6 @@ function toolchain(_buildDir, _libDir)
|
||||
elseif "linux-arm-gcc" == _OPTIONS["gcc"] then
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-linux-arm-gcc"))
|
||||
|
||||
elseif "linux-steamlink" == _OPTIONS["gcc"] then
|
||||
if not os.getenv("MARVELL_SDK_PATH") then
|
||||
print("Set MARVELL_SDK_PATH environment variable.")
|
||||
end
|
||||
|
||||
premake.gcc.cc = "$(MARVELL_SDK_PATH)/toolchain/bin/armv7a-cros-linux-gnueabi-gcc"
|
||||
premake.gcc.cxx = "$(MARVELL_SDK_PATH)/toolchain/bin/armv7a-cros-linux-gnueabi-g++"
|
||||
premake.gcc.ar = "$(MARVELL_SDK_PATH)/toolchain/bin/armv7a-cros-linux-gnueabi-ar"
|
||||
location (path.join(_buildDir, "projects", _ACTION .. "-linux-steamlink"))
|
||||
|
||||
elseif "mingw-gcc" == _OPTIONS["gcc"] then
|
||||
if not os.getenv("MINGW") then
|
||||
print("Set MINGW environment variable.")
|
||||
@@ -856,29 +846,6 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wl,-z,now",
|
||||
}
|
||||
|
||||
configuration { "linux-steamlink" }
|
||||
targetdir (path.join(_buildDir, "steamlink/bin"))
|
||||
objdir (path.join(_buildDir, "steamlink/obj"))
|
||||
libdirs { path.join(_libDir, "lib/steamlink") }
|
||||
includedirs { path.join(bxDir, "include/compat/linux") }
|
||||
defines {
|
||||
"__STEAMLINK__=1", -- There is no special prefedined compiler symbol to detect SteamLink, faking it.
|
||||
}
|
||||
buildoptions {
|
||||
"-Wfatal-errors",
|
||||
"-Wunused-value",
|
||||
"-Wundef",
|
||||
"-pthread",
|
||||
"-marm",
|
||||
"-mfloat-abi=hard",
|
||||
"--sysroot=$(MARVELL_SDK_PATH)/rootfs",
|
||||
}
|
||||
linkoptions {
|
||||
"-static-libgcc",
|
||||
"-static-libstdc++",
|
||||
"--sysroot=$(MARVELL_SDK_PATH)/rootfs",
|
||||
}
|
||||
|
||||
configuration { "android-arm" }
|
||||
targetdir (path.join(_buildDir, "android-arm/bin"))
|
||||
objdir (path.join(_buildDir, "android-arm/obj"))
|
||||
@@ -1264,13 +1231,7 @@ function strip()
|
||||
"$(SILENT) $(ANDROID_NDK_X86)/bin/i686-linux-android-strip -s \"$(TARGET)\""
|
||||
}
|
||||
|
||||
configuration { "linux-steamlink", "Release" }
|
||||
postbuildcommands {
|
||||
"$(SILENT) echo Stripping symbols.",
|
||||
"$(SILENT) $(MARVELL_SDK_PATH)/toolchain/bin/armv7a-cros-linux-gnueabi-strip -s \"$(TARGET)\""
|
||||
}
|
||||
|
||||
configuration { "linux-* or rpi", "not linux-steamlink", "Release" }
|
||||
configuration { "linux-* or rpi", "Release" }
|
||||
postbuildcommands {
|
||||
"$(SILENT) echo Stripping symbols.",
|
||||
"$(SILENT) strip -s \"$(TARGET)\""
|
||||
|
||||
12
src/os.cpp
12
src/os.cpp
@@ -27,15 +27,13 @@
|
||||
|| BX_PLATFORM_NX \
|
||||
|| BX_PLATFORM_OSX \
|
||||
|| BX_PLATFORM_PS4 \
|
||||
|| BX_PLATFORM_RPI \
|
||||
|| BX_PLATFORM_STEAMLINK
|
||||
|| BX_PLATFORM_RPI
|
||||
# include <sched.h> // sched_yield
|
||||
# if BX_PLATFORM_BSD \
|
||||
|| BX_PLATFORM_HAIKU \
|
||||
|| BX_PLATFORM_IOS \
|
||||
|| BX_PLATFORM_OSX \
|
||||
|| BX_PLATFORM_PS4 \
|
||||
|| BX_PLATFORM_STEAMLINK
|
||||
|| BX_PLATFORM_PS4
|
||||
# include <pthread.h> // mach_port_t
|
||||
# endif // BX_PLATFORM_*
|
||||
|
||||
@@ -47,8 +45,7 @@
|
||||
# if BX_PLATFORM_ANDROID
|
||||
# include <malloc.h> // mallinfo
|
||||
# elif BX_PLATFORM_LINUX \
|
||||
|| BX_PLATFORM_RPI \
|
||||
|| BX_PLATFORM_STEAMLINK
|
||||
|| BX_PLATFORM_RPI
|
||||
# include <stdio.h> // fopen
|
||||
# include <unistd.h> // syscall
|
||||
# include <sys/syscall.h>
|
||||
@@ -101,8 +98,7 @@ namespace bx
|
||||
#if BX_PLATFORM_WINDOWS
|
||||
return ::GetCurrentThreadId();
|
||||
#elif BX_PLATFORM_LINUX \
|
||||
|| BX_PLATFORM_RPI \
|
||||
|| BX_PLATFORM_STEAMLINK
|
||||
|| BX_PLATFORM_RPI
|
||||
return (pid_t)::syscall(SYS_gettid);
|
||||
#elif BX_PLATFORM_IOS \
|
||||
|| BX_PLATFORM_OSX
|
||||
|
||||
Reference in New Issue
Block a user