Eliminate TBB external search; we've had it internal for a long time

[lgritz]

It can confuse the build if there's a TBB on the system as well. Just use the internal version.

[lgritz]

It would be great if somebody using Windows could test this before we commit it to the trunk.

[robert-matusewicz]

Hi,

I will check if this works on Windows in weekend (hope we can wait with pulling those changes into main repo - or maybe someone else want to confirm that this works?)

[jeremyselan]

Looks good to me. (I've confirmed this works on OSX)

[lgritz]

There's no rush to merge this, I'll wait until Robert (or anybody else who gets to it first) verifies that it works on Windows.

[brechtvl]

I tried building this on Windows, but ran into issues.

First, it seems that tbb explicitly links to tbb.lib at the end of _tbb_windef.h, so when linking it can't find tbb.lib. After disabling that code, there were these unresolved symbols (repeated for a few other .obj files):

imagecache.obj : error LNK2019: unresolved external symbol ___TBB_machine_load8
imagecache.obj : error LNK2019: unresolved external symbol ___TBB_machine_store8
imagecache.obj : error LNK2019: unresolved external symbol ___TBB_machine_cmpswp8
imagecache.obj : error LNK2019: unresolved external symbol ___TBB_machine_fetchadd8

These appear to be implemented in asm for Windows... so I'm not sure how to proceed, is it worth it pulling that asm code in like tbb_misc.cpp?

[brechtvl]

It seems TBB should be off on Windows, but this gives compile errors. Added another pull request with a fix for that problem, works fine for me now.

[lgritz]

Brecht, now that I've merged your other patch (the one that fixed the 'ifdef USE_TBB' versus 'if USE_TBB' mixup), is THIS patch ok by you? Does it seem to work ok on Windows?

[brechtvl]

With this patch applied and USE_TBB off, it works ok. With this patch applied and USE_TBB on, it doesn't compile because of the link errors mentioned above.

Actually that same problem came up in this discussion from some time ago:
http://lists.openimageio.org/pipermail/oiio-dev-openimageio.org/2009-June/001157.html

There dropping TBB entirely on Windows is mentioned, I'm not sure why that hasn't happened yet, but now may be a good time to do it?

[lgritz]

Merged.