Skip to content

Commit

Permalink
Now this module can be built as shared.
Browse files Browse the repository at this point in the history
  • Loading branch information
Relintai committed Jan 3, 2020
1 parent 9d48a07 commit b559329
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 34 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
*.meta
*.obj
*.pyc
*.bc
*.bc
*.os
89 changes: 56 additions & 33 deletions SCsub
Original file line number Diff line number Diff line change
@@ -1,47 +1,70 @@
import os

Import('env')

env.add_source_files(env.modules_sources,"register_types.cpp")
module_env = env.Clone()

if os.path.isdir('../mesh_data_resource'):
module_env.Append(CPPDEFINES=['MESH_DATA_RESOURCE_PRESENT'])


sources = [

"register_types.cpp",

"containers/voxelman_queue.cpp",
"containers/voxelman_unbounded_queue.cpp",

"library/voxelman_library.cpp",
"library/voxelman_library_simple.cpp",
"library/voxelman_library_merger.cpp",

env.add_source_files(env.modules_sources,"containers/voxelman_queue.cpp")
env.add_source_files(env.modules_sources,"containers/voxelman_unbounded_queue.cpp")
"library/voxel_surface.cpp",
"library/voxel_surface_simple.cpp",
"library/voxel_surface_merger.cpp",

env.add_source_files(env.modules_sources,"library/voxelman_library.cpp")
env.add_source_files(env.modules_sources,"library/voxelman_library_simple.cpp")
env.add_source_files(env.modules_sources,"library/voxelman_library_merger.cpp")
"data/voxel_light.cpp",

env.add_source_files(env.modules_sources,"library/voxel_surface.cpp")
env.add_source_files(env.modules_sources,"library/voxel_surface_simple.cpp")
env.add_source_files(env.modules_sources,"library/voxel_surface_merger.cpp")
"meshers/voxel_mesher.cpp",
"meshers/transvoxel_cell_data.cpp",
"meshers/voxel_mesher_transvoxel.cpp",
"meshers/transvoxel_tables.cpp",

env.add_source_files(env.modules_sources,"data/voxel_light.cpp")
"world/voxel_world.cpp",
"world/voxel_chunk.cpp",
"world/voxel_structure.cpp",
"world/environment_data.cpp",
"world/voxel_chunk_prop_data.cpp",

env.add_source_files(env.modules_sources,"meshers/voxel_mesher.cpp")
env.add_source_files(env.modules_sources,"meshers/transvoxel_cell_data.cpp")
env.add_source_files(env.modules_sources,"meshers/voxel_mesher_transvoxel.cpp")
env.add_source_files(env.modules_sources,"meshers/transvoxel_tables.cpp")
"meshers/cubic_mesher/voxel_mesher_cubic.cpp",
"meshers/cubic_mesher/voxel_cube_points.cpp",

env.add_source_files(env.modules_sources,"world/voxel_world.cpp")
env.add_source_files(env.modules_sources,"world/voxel_chunk.cpp")
env.add_source_files(env.modules_sources,"world/voxel_structure.cpp")
env.add_source_files(env.modules_sources,"world/environment_data.cpp")
env.add_source_files(env.modules_sources,"world/voxel_chunk_prop_data.cpp")
"props/prop_data.cpp",
"props/prop_data_entry.cpp",
"props/prop_data_scene.cpp",
"props/prop_data_mesh.cpp",
"props/prop_data_light.cpp",
"props/prop_data_prop.cpp",
"props/prop_data_entity.cpp",

env.add_source_files(env.modules_sources,"meshers/cubic_mesher/voxel_mesher_cubic.cpp")
env.add_source_files(env.modules_sources,"meshers/cubic_mesher/voxel_cube_points.cpp")
"level_generator/voxelman_level_generator.cpp",

env.add_source_files(env.modules_sources,"props/prop_data.cpp")
env.add_source_files(env.modules_sources,"props/prop_data_entry.cpp")
env.add_source_files(env.modules_sources,"props/prop_data_scene.cpp")
env.add_source_files(env.modules_sources,"props/prop_data_mesh.cpp")
env.add_source_files(env.modules_sources,"props/prop_data_light.cpp")
env.add_source_files(env.modules_sources,"props/prop_data_prop.cpp")
env.add_source_files(env.modules_sources,"props/prop_data_entity.cpp")
"areas/world_area.cpp",

env.add_source_files(env.modules_sources,"level_generator/voxelman_level_generator.cpp")
"clutter/ground_clutter.cpp",
"clutter/ground_clutter_foliage.cpp",
]

env.add_source_files(env.modules_sources,"areas/world_area.cpp")

env.add_source_files(env.modules_sources,"clutter/ground_clutter.cpp")
env.add_source_files(env.modules_sources,"clutter/ground_clutter_foliage.cpp")
if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
# Shared lib compilation
module_env.Append(CCFLAGS=['-fPIC'])
module_env['LIBS'] = []
shared_lib = module_env.SharedLibrary(target='#bin/voxelman', source=sources)
shared_lib_shim = shared_lib[0].name.rsplit('.', 1)[0]
env.Append(LIBS=[shared_lib_shim])
env.Append(LIBPATH=['#bin'])
else:
# Static compilation
module_env.add_source_files(env.modules_sources, sources)

env.add_source_files(env.modules_sources,"register_types.cpp")

0 comments on commit b559329

Please sign in to comment.