make tsoloud work on OSX (#84)

This commit is contained in:
Timothee Cour 2019-01-29 21:47:53 -08:00 • committed by genotrance
commit ef8149778c
2 changed files with 10 additions and 10 deletions

View file

@ -40,13 +40,8 @@ proc testAll() =
when defined(Windows): when defined(Windows):
execCmd "nim c -r tests/tmath.nim" execCmd "nim c -r tests/tmath.nim"
execCmd "nim cpp -r tests/tmath.nim" execCmd "nim cpp -r tests/tmath.nim"
tsoloud() if defined(OSX) or defined(Windows) or not existsEnv("TRAVIS"):
elif defined(osx): tsoloud() # requires some libraries on linux, need them installed in TRAVIS
discard
elif existsEnv("TRAVIS"):
discard
else:
tsoloud()
task test, "Test": task test, "Test":
for options in ["", "-d:release"]: for options in ["", "-d:release"]:

View file

@ -22,16 +22,21 @@ cSkipSymbol("WavStream_stop", "WavStream_setFilter")
cIncludeDir(incl) cIncludeDir(incl)
when defined(Linux): when defined(osx):
cDefine("WITH_COREAUDIO")
{.passL: "-framework CoreAudio -framework AudioToolbox".}
cCompile(src/"backend/coreaudio/*.cpp")
elif defined(Linux):
{.passL: "-lpthread".} {.passL: "-lpthread".}
cDefine("WITH_OSS") cDefine("WITH_OSS")
cCompile(src/"backend/oss/*.cpp") cCompile(src/"backend/oss/*.cpp")
elif defined(Windows):
when defined(Windows):
{.passC: "-msse".} {.passC: "-msse".}
{.passL: "-lwinmm".} {.passL: "-lwinmm".}
cDefine("WITH_WINMM") cDefine("WITH_WINMM")
cCompile(src/"backend/winmm/*.cpp") cCompile(src/"backend/winmm/*.cpp")
else:
static: doAssert false
cCompile(src/"c_api/soloud_c.cpp") cCompile(src/"c_api/soloud_c.cpp")
cCompile(src/"core/*.cpp") cCompile(src/"core/*.cpp")