drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

osx fixes. Update cmake files.

Browse Source
This commit is contained in:
castano
2012-02-14 18:00:47 +00:00
parent 778bdec4ba
commit 21af952fec
7 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvcore/DefsGnucDarwin.h
View File

@ -25,7 +25,7 @@
#endif
#define NV_FASTCALL __attribute__((fastcall))
#define NV_FORCEINLINE __attribute__((always_inline))
#define NV_FORCEINLINE inline __attribute__((always_inline))
#define NV_DEPRECATED __attribute__((deprecated))
#if __GNUC__ > 2

2
src/nvcore/DefsGnucLinux.h
View File

@ -25,7 +25,7 @@
#endif
#define NV_FASTCALL __attribute__((fastcall))
#define NV_FORCEINLINE __attribute__((always_inline))
#define NV_FORCEINLINE inline __attribute__((always_inline))
#define NV_DEPRECATED __attribute__((deprecated))

2
src/nvcore/Utils.h
View File

@ -82,7 +82,7 @@ namespace nv
template <> inline uint8 toU8<uint16>(uint16 x) { nvDebugCheck(x <= NV_UINT8_MAX); return (uint8)x; }
template <> inline uint8 toU8<int16>(int16 x) { nvDebugCheck(x >= 0 && x <= NV_UINT8_MAX); return (uint8)x; }
//template <> inline uint8 toU8<uint8>(uint8 x) { return x; }
template <> inline uint8 toU8<int8>(int8 x) { nvDebugCheck(x >= 0 && x <= NV_UINT8_MAX); return (uint8)x; }
template <> inline uint8 toU8<int8>(int8 x) { nvDebugCheck(x >= 0); return (uint8)x; }
// int8 casts:
template <typename T> inline int8 toI8(T x) { return x; }