Waste and scrap now sort-of work for Carbon. Scrap is mostly empty, and waste uses...

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 7945d441661dfc0104f93dc881d032d03a8f345a..1a6b34b9a8bd04ce4aecf204115052af4af4d3c8 100644 (file)
--- 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 80185b5d1c65de2f0e2ca24c0eef50a55b1f56a8..a65900f5e23a24395cbb5f2292b96764e7ec453b 100644 (file)
--- 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"],