diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-01-19 17:56:43 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-01-19 17:56:43 +0000 |
| commit | 4a2e4ee4c6b8519d5ae5d8a560c09a8a57e93301 (patch) | |
| tree | dcbfdd5b19c25625165ee4ef25c4c8bac81730e6 | |
| parent | Update README.md (diff) | |
| download | DiligentTools-4a2e4ee4c6b8519d5ae5d8a560c09a8a57e93301.tar.gz DiligentTools-4a2e4ee4c6b8519d5ae5d8a560c09a8a57e93301.zip | |
Enabled MacOS build
| -rw-r--r-- | External/libtiff-4.0.3/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | External/libtiff-4.0.3/libtiff/tif_config.h | 4 | ||||
| -rw-r--r-- | External/libtiff-4.0.3/libtiff/tiffconf.h | 2 | ||||
| -rw-r--r-- | TextureLoader/src/Image.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/External/libtiff-4.0.3/CMakeLists.txt b/External/libtiff-4.0.3/CMakeLists.txt index ff3b031..70fa69d 100644 --- a/External/libtiff-4.0.3/CMakeLists.txt +++ b/External/libtiff-4.0.3/CMakeLists.txt @@ -47,7 +47,7 @@ set(SOURCE if(PLATFORM_WIN32) list(APPEND SOURCE libtiff/tif_win32.c) -elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX) +elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS) list(APPEND SOURCE libtiff/tif_unix.c) else() message(FATAL_ERROR "Unknown platform") diff --git a/External/libtiff-4.0.3/libtiff/tif_config.h b/External/libtiff-4.0.3/libtiff/tif_config.h index 45df73e..c25568d 100644 --- a/External/libtiff-4.0.3/libtiff/tif_config.h +++ b/External/libtiff-4.0.3/libtiff/tif_config.h @@ -6,7 +6,7 @@ # include "tif_config.android.h" -#elif defined(PLATFORM_LINUX) +#elif defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) # include "tif_config.linux.h" @@ -14,4 +14,4 @@ # error "Unknown platform" -#endif
\ No newline at end of file +#endif diff --git a/External/libtiff-4.0.3/libtiff/tiffconf.h b/External/libtiff-4.0.3/libtiff/tiffconf.h index 8806afc..e85055b 100644 --- a/External/libtiff-4.0.3/libtiff/tiffconf.h +++ b/External/libtiff-4.0.3/libtiff/tiffconf.h @@ -2,7 +2,7 @@ # include "tiffconf.vc.h" -#elif defined(PLATFORM_ANDROID) || defined(PLATFORM_LINUX) +#elif defined(PLATFORM_ANDROID) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) # include "tiffconf.linux.h" diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp index 1a42e41..4be827f 100644 --- a/TextureLoader/src/Image.cpp +++ b/TextureLoader/src/Image.cpp @@ -50,9 +50,9 @@ namespace Diligent { public: TIFFClientOpenWrapper( IDataBlob *pData ) : - m_pData( pData ), m_Offset( 0 ), - m_Size( pData->GetSize() ) + m_Size( pData->GetSize() ), + m_pData( pData ) { } |