osx fixes. Fix issue 211.

2014-12-02 20:23:21 +00:00
parent 2d6fc0e304
commit 7e2a9d1adb
42 changed files with 176 additions and 940 deletions
--- a/src/nvimage/BlockDXT.cpp
+++ b/src/nvimage/BlockDXT.cpp
@ -29,8 +29,8 @@
 #include "nvmath/Half.h"
 #include "nvmath/Vector.inl"

-#include "nvtt/bc6h/zoh.h"
-#include "nvtt/bc7/avpcl.h"
+#include "bc6h/zoh.h"
+#include "bc7/avpcl.h"


 using namespace nv;
--- a/src/nvimage/CMakeLists.txt
+++ b/src/nvimage/CMakeLists.txt
@ -53,7 +53,7 @@ ELSE(NVIMAGE_SHARED)
    ADD_LIBRARY(nvimage ${IMAGE_SRCS})
 ENDIF(NVIMAGE_SHARED)

-TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh)
+TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh bc6h bc7)

 INSTALL(TARGETS nvimage
    RUNTIME DESTINATION bin