diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-01-24 16:02:07 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-01-24 16:02:07 (GMT) |
| commit | 8c98266a7d1e8a1f3726df1fb1bf9f8404ee1e38 (patch) | |
| tree | eab4e05bd96fb475eee0dd7f04d85c405df74d1b | |
| parent | af6963c2f07c9e163278045cd5aeef4356fe2161 (diff) | |
| download | cpython-8c98266a7d1e8a1f3726df1fb1bf9f8404ee1e38.zip cpython-8c98266a7d1e8a1f3726df1fb1bf9f8404ee1e38.tar.gz cpython-8c98266a7d1e8a1f3726df1fb1bf9f8404ee1e38.tar.bz2 | |
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.
| -rw-r--r-- | Mac/scripts/fullbuild.py | 4 | ||||
| -rw-r--r-- | Mac/scripts/genpluginprojects.py | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py index 7945d44..1a6b34b 100644 --- a/Mac/scripts/fullbuild.py +++ b/Mac/scripts/fullbuild.py @@ -252,7 +252,7 @@ I_CARBON_PLUGINS : (buildmwproject, "CWIE", [ (":Mac:Build:calldll.carbon.mcp", "calldll.carbon"), (":Mac:Build:gdbm.carbon.mcp", "gdbm.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:_tkinter.mcp", "_tkinter.carbon"), ## (":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"), @@ -264,7 +264,7 @@ I_CARBON_PLUGINS : (buildmwproject, "CWIE", [ (":Mac:Build:List.carbon.mcp", "List.carbon"), (":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.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:Sndihooks.carbon.mcp", "Sndihooks.carbon"), (":Mac:Build:TE.carbon.mcp", "TE.carbon"), diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py index 80185b5..a65900f 100644 --- a/Mac/scripts/genpluginprojects.py +++ b/Mac/scripts/genpluginprojects.py @@ -131,7 +131,7 @@ def genallprojects(force=0): extradirs=["::Plugins"]) genpluginproject("all", "Qdoffs", extraexportsymbols=["GWorldObj_New", "GWorldObj_Convert"]) - genpluginproject("ppc", "Scrap") + genpluginproject("all", "Scrap") genpluginproject("ppc", "Snd", libraries=["SoundLib"]) genpluginproject("carbon", "Snd") genpluginproject("all", "Sndihooks", sources=[":snd:Sndihooks.c"]) @@ -158,6 +158,19 @@ def genallprojects(force=0): '::::Waste 1.3 Distribution:*', '::::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", "icglue", sources=["icgluemodule.c"], libraries=["ICGlueCFM-PPC.lib"], |