diff options
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/converter/build.scons | 1 | ||||
| -rw-r--r-- | o3d/import/build.scons | 11 | ||||
| -rw-r--r-- | o3d/serializer/build.scons | 1 | ||||
| -rw-r--r-- | o3d/tests/build.scons | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/o3d/converter/build.scons b/o3d/converter/build.scons index 50c7785..7037a21 100644 --- a/o3d/converter/build.scons +++ b/o3d/converter/build.scons @@ -45,6 +45,7 @@ env.Append( 'o3dImport', 'o3dImportConditioner', 'o3dCorePlatform', + 'o3dSerializationObjects', 'o3dSerializer', 'o3dUtils', 'o3d_base', diff --git a/o3d/import/build.scons b/o3d/import/build.scons index e831685..c0789032 100644 --- a/o3d/import/build.scons +++ b/o3d/import/build.scons @@ -62,11 +62,8 @@ else: env.Append(CCFLAGS = [['-include', 'import/cross/precompile.h']]) collada_inputs = [ - 'cross/camera_info.cc', 'cross/collada.cc', 'cross/collada_zip_archive.cc', - 'cross/destination_buffer.cc', - 'cross/json_object.cc', 'cross/zip_archive.cc', 'cross/gz_compressor.cc', 'cross/file_output_stream_processor.cc', @@ -74,6 +71,12 @@ collada_inputs = [ 'cross/targz_generator.cc', ] +serialization_objects_inputs = [ + 'cross/camera_info.cc', + 'cross/destination_buffer.cc', + 'cross/json_object.cc', +] + archive_inputs = [ pch_obj, @@ -108,7 +111,7 @@ if env.Bit('linux'): # Build a library called 'o3dImport' from the input sources. env.ComponentLibrary('o3dImport', collada_inputs) - +env.ComponentLibrary('o3dSerializationObjects', serialization_objects_inputs) env.ComponentLibrary('o3dArchive', archive_inputs) # Build a library that ONLY includes the stubbed-out conditioner code diff --git a/o3d/serializer/build.scons b/o3d/serializer/build.scons index 0f025a9..7cf98db 100644 --- a/o3d/serializer/build.scons +++ b/o3d/serializer/build.scons @@ -32,6 +32,7 @@ Import('env') env.Append( LIBS = [ + 'o3dSerializationObjects', 'o3dCore', 'o3dUtils', 'o3d_base', diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index e79d9de..dd46488 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -101,6 +101,7 @@ env.Prepend( 'o3dImport', 'o3dArchive', 'o3dCorePlatform', + 'o3dSerializationObjects', 'o3dSerializer', 'o3dUtils', 'o3d_base', |