First pass of build fixes
This commit is contained in:
		
							parent
							
								
									fdc6c99abd
								
							
						
					
					
						commit
						967fe4d0fb
					
				@ -43,6 +43,7 @@ def BuildEverything():
 | 
				
			|||||||
			'dwarf_cfi_to_module.cc',
 | 
								'dwarf_cfi_to_module.cc',
 | 
				
			||||||
			'dwarf_cu_to_module.cc',
 | 
								'dwarf_cu_to_module.cc',
 | 
				
			||||||
			'dwarf_line_to_module.cc',
 | 
								'dwarf_line_to_module.cc',
 | 
				
			||||||
 | 
								'dwarf_range_list_handler.cc',
 | 
				
			||||||
			'language.cc',
 | 
								'language.cc',
 | 
				
			||||||
			'module.cc',
 | 
								'module.cc',
 | 
				
			||||||
			'path_helper.cc',
 | 
								'path_helper.cc',
 | 
				
			||||||
@ -78,7 +79,7 @@ def BuildEverything():
 | 
				
			|||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'common.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'common.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'Release', 'lib', 'crash_generation_client.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'Release', 'lib', 'crash_generation_client.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'libdisasm.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'third_party', 'libdisasm', 'Release', 'lib', 'libdisasm.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'processor.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'processor.lib'),
 | 
				
			||||||
		]
 | 
							]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -28,31 +28,30 @@ def BuildEverything():
 | 
				
			|||||||
	extension = AMBuild.AddJob(name)
 | 
						extension = AMBuild.AddJob(name)
 | 
				
			||||||
	binary = Cpp.ExecutableBuilder(name, AMBuild, extension, compiler)
 | 
						binary = Cpp.ExecutableBuilder(name, AMBuild, extension, compiler)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	sourceFiles = [
 | 
						binary.AddSourceFiles('test', [
 | 
				
			||||||
		'test.cpp',
 | 
							'test.cpp',
 | 
				
			||||||
	]
 | 
						]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if AMBuild.target['platform'] in ['linux']:
 | 
						if AMBuild.target['platform'] in ['linux']:
 | 
				
			||||||
		sourceFiles.extend([
 | 
							binary.AddSourceFiles(os.path.join('breakpad', 'src', 'src', 'common'), [
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf_cfi_to_module.cc'),
 | 
								'dwarf_cfi_to_module.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf_cu_to_module.cc'),
 | 
								'dwarf_cu_to_module.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf_line_to_module.cc'),
 | 
								'dwarf_line_to_module.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'language.cc'),
 | 
								'dwarf_range_list_handler.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'module.cc'),
 | 
								'language.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'path_helper.cc'),
 | 
								'module.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'stabs_reader.cc'),
 | 
								'path_helper.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'stabs_to_module.cc'),
 | 
								'stabs_reader.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'bytereader.cc'),
 | 
								'stabs_to_module.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'dwarf2diehandler.cc'),
 | 
								'dwarf/bytereader.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'dwarf2reader.cc'),
 | 
								'dwarf/dwarf2diehandler.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'dwarf', 'elf_reader.cc'),
 | 
								'dwarf/dwarf2reader.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'linux', 'crc32.cc'),
 | 
								'dwarf/elf_reader.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'linux', 'dump_symbols.cc'),
 | 
								'linux/crc32.cc',
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'common', 'linux', 'elf_symbols_to_module.cc'),
 | 
								'linux/dump_symbols.cc',
 | 
				
			||||||
 | 
								'linux/elf_symbols_to_module.cc',
 | 
				
			||||||
		])
 | 
							])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	binary.AddSourceFiles('test', sourceFiles);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if AMBuild.target['platform'] in ['linux']:
 | 
						if AMBuild.target['platform'] in ['linux']:
 | 
				
			||||||
		libs = [
 | 
							libs = [
 | 
				
			||||||
			('libbreakpad_client.a', os.path.join('breakpad', 'build', 'src', 'client', 'linux', 'libbreakpad_client.a')),
 | 
								('libbreakpad_client.a', os.path.join('breakpad', 'build', 'src', 'client', 'linux', 'libbreakpad_client.a')),
 | 
				
			||||||
@ -74,7 +73,7 @@ def BuildEverything():
 | 
				
			|||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'common.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'common.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'Release', 'lib', 'crash_generation_client.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'Release', 'lib', 'crash_generation_client.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'libdisasm.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'third_party', 'libdisasm', 'Release', 'lib', 'libdisasm.lib'),
 | 
				
			||||||
			os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'processor.lib'),
 | 
								os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'processor', 'Release', 'lib', 'processor.lib'),
 | 
				
			||||||
		]
 | 
							]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user