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

Fix errors after merge. Update cmake files.

Browse Source
This commit is contained in:
castano 2010-03-16 22:46:09 +00:00
parent a19e25228f
commit 3b0e0c3402
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvcore/Debug.cpp
View File

@ -48,7 +48,7 @@
# endif # endif
#endif #endif
//#include <stdexcept> // std::runtime_error #include <stdexcept> // std::runtime_error
#undef assert // defined on mingw #undef assert // defined on mingw
using namespace nv; using namespace nv;
@ -360,8 +360,7 @@ namespace
if( ret == NV_ABORT_EXIT ) { if( ret == NV_ABORT_EXIT ) {
// Exit cleanly. // Exit cleanly.
//throw std::runtime_error("Assertion failed"); throw std::runtime_error("Assertion failed");
throw "Assertion failed";
} }
return ret; return ret;

14
src/nvtt/CMakeLists.txt
View File

@ -10,10 +10,10 @@ SET(NVTT_SRCS
nvtt_wrapper.h nvtt_wrapper.h
nvtt_wrapper.cpp nvtt_wrapper.cpp
Compressor.h Compressor.h
CompressDXT.h CompressorDXT.h
CompressDXT.cpp CompressorDXT.cpp
CompressRGB.h CompressorRGB.h
CompressRGB.cpp CompressorRGB.cpp
QuickCompressDXT.h QuickCompressDXT.h
QuickCompressDXT.cpp QuickCompressDXT.cpp
OptimalCompressDXT.h OptimalCompressDXT.h
@ -29,9 +29,9 @@ SET(NVTT_SRCS
cuda/CudaUtils.h cuda/CudaUtils.h
cuda/CudaUtils.cpp cuda/CudaUtils.cpp
cuda/CudaMath.h cuda/CudaMath.h
cuda/Bitmaps.h cuda/BitmapTable.h
cuda/CudaCompressDXT.h cuda/CudaCompressorDXT.h
cuda/CudaCompressDXT.cpp) cuda/CudaCompressorDXT.cpp)
IF (CUDA_FOUND) IF (CUDA_FOUND)
ADD_DEFINITIONS(-DHAVE_CUDA) ADD_DEFINITIONS(-DHAVE_CUDA)

5
src/nvtt/CompressorDXT.cpp
View File

@ -71,9 +71,10 @@ typedef ULONG_PTR DWORD_PTR;
#include "stb/stb_dxt.h" #include "stb/stb_dxt.h"
#endif #endif
#pragma message(NV_FILE_LINE "FIXME: Define HAVE_OPENMP from cmake.") // OpenMP
#define HAVE_OPENMP #if defined(HAVE_OPENMP)
#include <omp.h> #include <omp.h>
#endif
using namespace nv; using namespace nv;
using namespace nvtt; using namespace nvtt;