mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	Waste and scrap now sort-of work for Carbon. Scrap is mostly empty, and waste uses a mixture between Waste 2.0 and Waste 1.3.
This commit is contained in:
		
							parent
							
								
									af6963c2f0
								
							
						
					
					
						commit
						8c98266a7d
					
				
					 2 changed files with 16 additions and 3 deletions
				
			
		|  | @ -252,7 +252,7 @@ def handle_dialog(filename): | ||||||
| 	(":Mac:Build:calldll.carbon.mcp", "calldll.carbon"), | 	(":Mac:Build:calldll.carbon.mcp", "calldll.carbon"), | ||||||
| 	(":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"), | 	(":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"), | ||||||
| ##	(":Mac:Build:icglue.carbon.mcp", "icglue.carbon"), | ##	(":Mac:Build:icglue.carbon.mcp", "icglue.carbon"), | ||||||
| ##	(":Mac:Build:waste.carbon.mcp", "waste.carbon"), | 	(":Mac:Build:waste.carbon.mcp", "waste.carbon"), | ||||||
| 	(":Mac:Build:zlib.carbon.mcp", "zlib.carbon"), | 	(":Mac:Build:zlib.carbon.mcp", "zlib.carbon"), | ||||||
| ##	(":Mac:Build:_tkinter.mcp", "_tkinter.carbon"), | ##	(":Mac:Build:_tkinter.mcp", "_tkinter.carbon"), | ||||||
| ##	(":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"), | ##	(":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"), | ||||||
|  | @ -264,7 +264,7 @@ def handle_dialog(filename): | ||||||
| 	(":Mac:Build:List.carbon.mcp", "List.carbon"), | 	(":Mac:Build:List.carbon.mcp", "List.carbon"), | ||||||
| 	(":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.carbon"), | 	(":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.carbon"), | ||||||
| 	(":Mac:Build:Qt.carbon.mcp", "Qt.carbon"), | 	(":Mac:Build:Qt.carbon.mcp", "Qt.carbon"), | ||||||
| ##	(":Mac:Build:Scrap.carbon.mcp", "Scrap.carbon"), | 	(":Mac:Build:Scrap.carbon.mcp", "Scrap.carbon"), | ||||||
| 	(":Mac:Build:Snd.carbon.mcp", "Snd.carbon"), | 	(":Mac:Build:Snd.carbon.mcp", "Snd.carbon"), | ||||||
| 	(":Mac:Build:Sndihooks.carbon.mcp", "Sndihooks.carbon"), | 	(":Mac:Build:Sndihooks.carbon.mcp", "Sndihooks.carbon"), | ||||||
| 	(":Mac:Build:TE.carbon.mcp", "TE.carbon"), | 	(":Mac:Build:TE.carbon.mcp", "TE.carbon"), | ||||||
|  |  | ||||||
|  | @ -131,7 +131,7 @@ def	genallprojects(force=0): | ||||||
| 			extradirs=["::Plugins"]) | 			extradirs=["::Plugins"]) | ||||||
| 	genpluginproject("all", "Qdoffs", | 	genpluginproject("all", "Qdoffs", | ||||||
| 		extraexportsymbols=["GWorldObj_New", "GWorldObj_Convert"]) | 		extraexportsymbols=["GWorldObj_New", "GWorldObj_Convert"]) | ||||||
| 	genpluginproject("ppc", "Scrap") | 	genpluginproject("all", "Scrap") | ||||||
| 	genpluginproject("ppc", "Snd", libraries=["SoundLib"]) | 	genpluginproject("ppc", "Snd", libraries=["SoundLib"]) | ||||||
| 	genpluginproject("carbon", "Snd") | 	genpluginproject("carbon", "Snd") | ||||||
| 	genpluginproject("all", "Sndihooks", sources=[":snd:Sndihooks.c"]) | 	genpluginproject("all", "Sndihooks", sources=[":snd:Sndihooks.c"]) | ||||||
|  | @ -158,6 +158,19 @@ def	genallprojects(force=0): | ||||||
| 			'::::Waste 1.3 Distribution:*', | 			'::::Waste 1.3 Distribution:*', | ||||||
| 			'::::ICProgKit1.4:APIs'] | 			'::::ICProgKit1.4:APIs'] | ||||||
| 		) | 		) | ||||||
|  | 	# This is a hack, combining parts of Waste 2.0 with parts of 1.3 | ||||||
|  | 	genpluginproject("carbon", "waste", | ||||||
|  | 		sources=[ | ||||||
|  | 			"wastemodule.c", | ||||||
|  | 			"WEObjectHandlers.c", | ||||||
|  | 			"WETabs.c", "WETabHooks.c"], | ||||||
|  | 		libraries=["WASTE.Carbon.lib"], | ||||||
|  | 		extradirs=[ | ||||||
|  | 			'{Compiler}:MacOS Support:(Third Party Support):Waste 2.0 Distribution:C_C++ Headers', | ||||||
|  | 			'{Compiler}:MacOS Support:(Third Party Support):Waste 2.0 Distribution:Static Libraries', | ||||||
|  | 			'::::Waste 1.3 Distribution:Extras:Sample Object Handlers', | ||||||
|  | 			'::::Waste 1.3 Distribution:Extras:Waste Tabs 1.3.2'] | ||||||
|  | 		) | ||||||
| 	genpluginproject("ppc", "ctb") | 	genpluginproject("ppc", "ctb") | ||||||
| 	genpluginproject("ppc", "icglue", sources=["icgluemodule.c"],  | 	genpluginproject("ppc", "icglue", sources=["icgluemodule.c"],  | ||||||
| 		libraries=["ICGlueCFM-PPC.lib"],  | 		libraries=["ICGlueCFM-PPC.lib"],  | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Jack Jansen
						Jack Jansen