Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated NaCl toolchain to v49.

Browse Source
This commit is contained in:
Branimir Karadžić
2016-09-02 21:23:38 -07:00
parent cea3764bd9
commit 9c19c10620
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/bx/os.h
View File

@@ -34,14 +34,10 @@
# include <pthread.h> // mach_port_t # include <pthread.h> // mach_port_t
# endif // BX_PLATFORM_* # endif // BX_PLATFORM_*
# if BX_PLATFORM_NACL # include <time.h> // nanosleep
# include <sys/nacl_syscalls.h> // nanosleep # if !BX_PLATFORM_PS4 && !BX_PLATFORM_NACL
# else # include <dlfcn.h> // dlopen, dlclose, dlsym
# include <time.h> // nanosleep # endif // !BX_PLATFORM_PS4 && !BX_PLATFORM_NACL
# if !BX_PLATFORM_PS4
# include <dlfcn.h> // dlopen, dlclose, dlsym
# endif // !BX_PLATFORM_PS4
# endif // BX_PLATFORM_NACL
# if BX_PLATFORM_ANDROID # if BX_PLATFORM_ANDROID
# include <malloc.h> // mallinfo # include <malloc.h> // mallinfo

24
scripts/toolchain.lua
View File

@@ -291,11 +291,11 @@ function toolchain(_buildDir, _libDir)
print("Set NACL_SDK_ROOT enviroment variable.") print("Set NACL_SDK_ROOT enviroment variable.")
end end
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_x86_newlib/bin/x86_64-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_x86_glibc/bin/x86_64-nacl-"
if os.is("macosx") then if os.is("macosx") then
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_x86_newlib/bin/x86_64-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_x86_glibc/bin/x86_64-nacl-"
elseif os.is("linux") then elseif os.is("linux") then
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_x86_newlib/bin/x86_64-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_x86_glibc/bin/x86_64-nacl-"
end end
premake.gcc.cc = naclToolchain .. "gcc" premake.gcc.cc = naclToolchain .. "gcc"
@@ -309,11 +309,11 @@ function toolchain(_buildDir, _libDir)
print("Set NACL_SDK_ROOT enviroment variable.") print("Set NACL_SDK_ROOT enviroment variable.")
end end
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_arm_newlib/bin/arm-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_arm_glibc/bin/arm-nacl-"
if os.is("macosx") then if os.is("macosx") then
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_arm_newlib/bin/arm-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_arm_glibc/bin/arm-nacl-"
elseif os.is("linux") then elseif os.is("linux") then
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_arm_newlib/bin/arm-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_arm_glibc/bin/arm-nacl-"
end end
premake.gcc.cc = naclToolchain .. "gcc" premake.gcc.cc = naclToolchain .. "gcc"
@@ -938,10 +938,10 @@ function toolchain(_buildDir, _libDir)
linkoptions { "-melf32_nacl" } linkoptions { "-melf32_nacl" }
configuration { "x32", "nacl", "Debug" } configuration { "x32", "nacl", "Debug" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Debug" } libdirs { "$(NACL_SDK_ROOT)/lib/glibc_x86_32/Debug" }
configuration { "x32", "nacl", "Release" } configuration { "x32", "nacl", "Release" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Release" } libdirs { "$(NACL_SDK_ROOT)/lib/glibc_x86_32/Release" }
configuration { "x64", "nacl" } configuration { "x64", "nacl" }
targetdir (path.join(_buildDir, "nacl-x64/bin")) targetdir (path.join(_buildDir, "nacl-x64/bin"))
@@ -950,10 +950,10 @@ function toolchain(_buildDir, _libDir)
linkoptions { "-melf64_nacl" } linkoptions { "-melf64_nacl" }
configuration { "x64", "nacl", "Debug" } configuration { "x64", "nacl", "Debug" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Debug" } libdirs { "$(NACL_SDK_ROOT)/lib/glibc_x86_64/Debug" }
configuration { "x64", "nacl", "Release" } configuration { "x64", "nacl", "Release" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Release" } libdirs { "$(NACL_SDK_ROOT)/lib/glibc_x86_64/Release" }
configuration { "nacl-arm" } configuration { "nacl-arm" }
buildoptions { buildoptions {
@@ -964,10 +964,10 @@ function toolchain(_buildDir, _libDir)
libdirs { path.join(_libDir, "lib/nacl-arm") } libdirs { path.join(_libDir, "lib/nacl-arm") }
configuration { "nacl-arm", "Debug" } configuration { "nacl-arm", "Debug" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Debug" } libdirs { "$(NACL_SDK_ROOT)/lib/glibc_arm/Debug" }
configuration { "nacl-arm", "Release" } configuration { "nacl-arm", "Release" }
libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Release" } libdirs { "$(NACL_SDK_ROOT)/lib/glibc_arm/Release" }
configuration { "pnacl" } configuration { "pnacl" }
targetdir (path.join(_buildDir, "pnacl/bin")) targetdir (path.join(_buildDir, "pnacl/bin"))