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

Manually integrated @gtbass OSX changes.

Browse Source
This commit is contained in:
bkaradzic
2012-12-09 14:46:27 -08:00
parent 93f87ac56b
commit 5dc22d90e1
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,3 +1,5 @@
.build/
.debug/
.svn/
tags
.DS_Store

4
include/bx/sem.h
View File

@@ -42,8 +42,8 @@ namespace bx
bool wait(int32_t _msecs = -1)
{
#if BX_PLATFORM_NACL
BX_CHECK(-1 == _msecs, "NaCl doesn't support sem_timedwait at this moment.");
#if BX_PLATFORM_NACL || BX_PLATFORM_OSX
BX_CHECK(-1 == _msecs, "NaCl and OSX don't support sem_timedwait at this moment.");
return 0 == sem_wait(&m_handle);
#else
if (0 > _msecs)

1
include/compat/osx/unordered_map Normal file
View File

@@ -0,0 +1 @@
#include <tr1/unordered_map>

11
premake/toolchain.lua
View File

@@ -283,5 +283,16 @@ function toolchain(_buildDir, _libDir)
"_XBOX",
}
configuration { "macosx" }
buildoptions {
"-U__STRICT_ANSI__",
"-Wunused-value",
"-msse2",
}
includedirs { bxDir .. "include/compat/osx" }
targetdir (_buildDir .. "osx" .. "/bin")
objdir (_buildDir .. "osx" .. "/obj")
libdirs { _libDir .. "lib/osx" }
configuration {} -- reset configuration
end