diff options
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/cross/memory_stream_test.cc | 6 | ||||
| -rw-r--r-- | o3d/import/import.gyp | 35 |
2 files changed, 38 insertions, 3 deletions
diff --git a/o3d/import/cross/memory_stream_test.cc b/o3d/import/cross/memory_stream_test.cc index a02fcca..77ae95c 100644 --- a/o3d/import/cross/memory_stream_test.cc +++ b/o3d/import/cross/memory_stream_test.cc @@ -233,7 +233,7 @@ TEST_F(MemoryStreamTest, EndianSanityFloat32) { uint8 *p8 = reinterpret_cast<uint8*>(p); MemoryWriteStream write_stream(p8, sizeof(int32) * 2); - float value = 3.14159; + float value = 3.14159f; write_stream.WriteLittleEndianFloat32(value); write_stream.WriteBigEndianFloat32(value); @@ -261,9 +261,9 @@ TEST_F(MemoryStreamTest, EndianSanityFloat32) { TEST_F(MemoryStreamTest, Endian) { const int16 kValue1 = 13243; const int32 kValue2 = 2393043; - const float kValue3 = -0.039483; + const float kValue3 = -0.039483f; const int16 kValue4 = -3984; - const float kValue5 = 1234.5678; + const float kValue5 = 1234.5678f; const uint8 kValue6 = 5; // write a single byte to make things interesting const int32 kValue7 = -3920393; diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp index 4ecb9c64..41cd4c4 100644 --- a/o3d/import/import.gyp +++ b/o3d/import/import.gyp @@ -126,5 +126,40 @@ ], ], }, + { + 'target_name': 'o3dImportTest', + 'type': 'none', + 'dependencies': [ + 'o3dArchive', + 'o3dImport', + '../../<(antlrdir)/antlr.gyp:antlr3c', + '../../<(fcolladadir)/fcollada.gyp:fcollada', + '../../<(jpegdir)/libjpeg.gyp:libjpeg', + '../../<(pngdir)/libpng.gyp:libpng', + '../../<(zlibdir)/zlib.gyp:zlib', + ], + 'direct_dependent_settings': { + 'sources': [ + 'cross/gz_compressor_test.cc', + 'cross/gz_decompressor_test.cc', + 'cross/memory_buffer_test.cc', + 'cross/memory_stream_test.cc', + 'cross/raw_data_test.cc', + 'cross/tar_generator_test.cc', + 'cross/tar_processor_test.cc', + 'cross/targz_generator_test.cc', + 'cross/targz_processor_test.cc', + ], + 'conditions' : [ + ['renderer == "d3d9" and OS == "win"', + { + 'include_dirs': [ + '$(DXSDK_DIR)/Include', + ], + } + ], + ], + }, + }, ], } |