diff options
Diffstat (limited to 'o3d/main.scons')
| -rw-r--r-- | o3d/main.scons | 230 |
1 files changed, 0 insertions, 230 deletions
diff --git a/o3d/main.scons b/o3d/main.scons index c9ae0bf..10976da 100644 --- a/o3d/main.scons +++ b/o3d/main.scons @@ -482,146 +482,6 @@ windows_gl_optimized_env.Append(BUILD_GROUPS = ['most']) AddWindowsOptimizedSettings(windows_gl_optimized_env) environment_list.append(windows_gl_optimized_env) -windows_cb_env = windows_env.Clone() -windows_cb_env.Append( - CPPDEFINES = ['RENDERER_CB', 'CB_SERVICE_D3D9'], - BUILD_COMPONENTS = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client' - ], - RENDERER_INCLUDE_PATH = [], - RENDERER_LIB_PATH = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client', - ], - # TODO: remove link-time dependency on d3dx9, using dynamic loading - # instead. - RENDERER_LIBS = [ - 'o3dCmdBuf_service', - 'o3dCmdBuf_client', - 'o3dCmdBuf_common', - 'd3d9', 'dxerr', 'd3dx9' - ] + nacl_htp_all_libs -) - -windows_cb_debug_env = windows_cb_env.Clone( - BUILD_TYPE = 'dbg-cb', - BUILD_TYPE_DESCRIPTION = 'Windows Command Buffer debug build', -) - -AddWindowsDebugSettings(windows_cb_debug_env) -environment_list.append(windows_cb_debug_env) - - -windows_cb_optimized_env = windows_cb_env.Clone( - BUILD_TYPE = 'opt-cb', - BUILD_TYPE_DESCRIPTION = 'Windows Command Buffer optimized build', -) - -AddWindowsOptimizedSettings(windows_cb_optimized_env) -environment_list.append(windows_cb_optimized_env) - - -windows_cb_gl_env = windows_env.Clone() -windows_cb_gl_env.Append( - CPPDEFINES = ['RENDERER_CB', 'CB_SERVICE_GL'], - BUILD_COMPONENTS = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client' - ], - RENDERER_INCLUDE_PATH = [ - '$GLEW_DIR/include', - '$CG_DIR/include', - ], - RENDERER_LIB_PATH = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client', - '$CG_DIR/lib', - '$GLEW_DIR/lib', - ], - RENDERER_LIBS = [ - 'o3dCmdBuf_service', - 'o3dCmdBuf_client', - 'o3dCmdBuf_common', - 'OpenGL32', - 'glew32', - 'cg', - 'cgGL', - ] + nacl_htp_all_libs, -) - -windows_cb_gl_debug_env = windows_cb_gl_env.Clone( - BUILD_TYPE = 'dbg-cb-gl', - BUILD_TYPE_DESCRIPTION = - 'Windows Command Buffer using OpenGL debug build' -) - -AddWindowsDebugSettings(windows_cb_gl_debug_env) -environment_list.append(windows_cb_gl_debug_env) - -windows_cb_gl_optimized_env = windows_cb_gl_env.Clone( - BUILD_TYPE = 'opt-cb-gl', - BUILD_TYPE_DESCRIPTION = - 'Windows Command Buffer using OpenGL optimized build', -) - -AddWindowsOptimizedSettings(windows_cb_gl_optimized_env) -environment_list.append(windows_cb_gl_optimized_env) - - -# These configs are highly very experimental, and just including them -# necessitate downloading the nacl sdk even if they are not active. So include -# them only when a specific flag is passed on the command line. -if ARGUMENTS.get('enable-nacl', ''): - nacl_env = binaries_env.Clone( - tools = ['naclsdk'], - BUILD_COMPONENTS = [ - 'command_buffer/common', - 'command_buffer/client', - 'command_buffer/samples', - ], - # This should be set by hammer but is not... - TARGET_PLATFORM = 'NACL', - # Only the base IMC lib is necessary in nacl - NACL_HTP_LIBS = [nacl_imc_lib], - CCFLAGS = ['-Wstrict-aliasing'], - NACL_VARIANT = 'nacl', - ) - nacl_env.Append( - CPPDEFINES = ['RENDERER_CB'], - RENDERER_INCLUDE_PATH = [], - RENDERER_LIB_PATH = [ - 'command_buffer/common', - 'command_buffer/client', - ], - RENDERER_LIBS = [ - 'o3dCmdBuf_client', - 'o3dCmdBuf_common', - nacl_imc_lib, - ], - ) - nacl_dbg_env = nacl_env.Clone( - BUILD_TYPE = 'dbg-nacl', - BUILD_TYPE_DESCRIPTION = 'NaCl debug build', - ) - nacl_dbg_env.Append( - CCFLAGS = ['-g'], - ) - environment_list.append(nacl_dbg_env) - nacl_opt_env = nacl_env.Clone( - BUILD_TYPE = 'opt-nacl', - BUILD_TYPE_DESCRIPTION = 'NaCl debug build', - ) - nacl_opt_env.Append( - CCFLAGS = ['-O3'], - CPPDEFINES = ['NDEBUG'], - ) - environment_list.append(nacl_opt_env) - # MacOS ------------------------------------------------------------------ mac_env = binaries_env.Clone( @@ -707,47 +567,6 @@ mac_optimized_env = mac_env.Clone( AddMacOptimizedSettings(mac_optimized_env) environment_list.append(mac_optimized_env) -mac_cb_env = mac_env.Clone() - -mac_cb_env.Append( - CPPDEFINES = ['RENDERER_CB'], - BUILD_COMPONENTS = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client' - ], - RENDERER_INCLUDE_PATH = [], - RENDERER_LIB_PATH = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client', - ], - RENDERER_LIBS = [ - 'o3dCmdBuf_service', - 'o3dCmdBuf_client', - 'o3dCmdBuf_common', - 'MacStaticGLEW' - ] + nacl_htp_all_libs -) - -mac_cb_debug_env = mac_cb_env.Clone( - BUILD_TYPE = 'dbg-mac-cb', - BUILD_TYPE_DESCRIPTION = 'Mac command buffer debug build', - DEBUG = True, - NACL_VARIANT = 'dbg-mac' -) - -AddMacDebugSettings(mac_cb_debug_env) -environment_list.append(mac_cb_debug_env) - -mac_cb_optimized_env = mac_cb_env.Clone( - BUILD_TYPE = 'opt-mac-cb', - BUILD_TYPE_DESCRIPTION = 'Mac Command Buffer optimized build', -) - -AddMacOptimizedSettings(mac_cb_optimized_env) -environment_list.append(mac_cb_optimized_env) - mac_test_optimized_env = mac_optimized_env.Clone( BUILD_TYPE = 'test-opt-mac', BUILD_TYPE_DESCRIPTION = 'MacOS optimized build for testing', @@ -837,55 +656,6 @@ linux_optimized_env.Append( ) environment_list.append(linux_optimized_env) -linux_cb_env = linux_env.Clone() -linux_cb_env.FilterOut(CPPDEFINES = ['RENDERER_GL']) -linux_cb_env.Append( - CPPDEFINES = ['RENDERER_CB'], - BUILD_COMPONENTS = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client' - ], - RENDERER_INCLUDE_PATH = [], - RENDERER_LIB_PATH = [ - 'command_buffer/common', - 'command_buffer/service', - 'command_buffer/client', - ], - RENDERER_LIBS = [ - 'o3dCmdBuf_service', - 'o3dCmdBuf_client', - 'o3dCmdBuf_common', - 'GL', - 'GLEW', - 'Cg', - 'CgGL', - ] + linux_cb_env['NACL_HTP_LIBS'], -) - -linux_cb_debug_env = linux_cb_env.Clone( - BUILD_TYPE = 'dbg-linux-cb', - BUILD_TYPE_DESCRIPTION = 'Linux Command Buffer debug build', - DEBUG = True, - NACL_VARIANT = 'dbg-linux', -) -linux_cb_debug_env.Append( - CCFLAGS = ['-g'], -) -environment_list.append(linux_cb_debug_env) - -linux_cb_optimized_env = linux_cb_env.Clone( - BUILD_TYPE = 'opt-linux-cb', - BUILD_TYPE_DESCRIPTION = 'Linux Command Buffer optimized build', - DEBUG = False, - NACL_VARIANT = 'opt-linux', -) -linux_cb_optimized_env.Append( - CCFLAGS = ['-O3'], - CPPDEFINES = ['-DNDEBUG'], -) -environment_list.append(linux_cb_optimized_env) - # Documentation ------------------------------------------------------------- docs_env = base_env.Clone( |