Ported the icglue module to carbon.
diff --git a/Mac/Lib/ic.py b/Mac/Lib/ic.py
index 47091c7..5756463 100644
--- a/Mac/Lib/ic.py
+++ b/Mac/Lib/ic.py
@@ -162,7 +162,8 @@
self.ic = ic
else:
self.ic = icglue.ICStart(signature)
- self.ic.ICFindConfigFile()
+ if hasattr(self.ic, 'ICFindConfigFile'):
+ self.ic.ICFindConfigFile()
self.h = Res.Resource('')
def keys(self):
diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index 2189996..b617439 100644
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -69,6 +69,7 @@
/* ---------------------------------------------------------------- */
+#if !TARGET_API_MAC_CARBON
static char ici_ICFindConfigFile__doc__[] =
"()->None; Find config file in standard places"
;
@@ -128,6 +129,7 @@
Py_INCREF(Py_None);
return Py_None;
}
+#endif /* !TARGET_API_MAC_CARBON */
static char ici_ICChooseNewConfig__doc__[] =
@@ -458,10 +460,12 @@
static struct PyMethodDef ici_methods[] = {
- {"ICFindConfigFile", (PyCFunction)ici_ICFindConfigFile, METH_VARARGS, ici_ICFindConfigFile__doc__},
+#if !TARGET_API_MAC_CARBON
+ {"ICFindConfigFile", (PyCFunction)ici_ICFindConfigFile, METH_VARARGS, ici_ICFindConfigFile__doc__},
{"ICFindUserConfigFile", (PyCFunction)ici_ICFindUserConfigFile, METH_VARARGS, ici_ICFindUserConfigFile__doc__},
{"ICChooseConfig", (PyCFunction)ici_ICChooseConfig, METH_VARARGS, ici_ICChooseConfig__doc__},
{"ICChooseNewConfig", (PyCFunction)ici_ICChooseNewConfig, METH_VARARGS, ici_ICChooseNewConfig__doc__},
+#endif /* !TARGET_API_MAC_CARBON */
{"ICGetSeed", (PyCFunction)ici_ICGetSeed, METH_VARARGS, ici_ICGetSeed__doc__},
{"ICBegin", (PyCFunction)ici_ICBegin, METH_VARARGS, ici_ICBegin__doc__},
{"ICFindPrefHandle", (PyCFunction)ici_ICFindPrefHandle, METH_VARARGS, ici_ICFindPrefHandle__doc__},
diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h
index 5d54e85..6a4307a 100644
--- a/Mac/mwerks/mwerks_nscarbon_config.h
+++ b/Mac/mwerks/mwerks_nscarbon_config.h
@@ -29,7 +29,7 @@
/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
#define USE_GDBM /* Include the gdbm module */
#define USE_ZLIB /* Include the zlib module */
-/* #define USE_IC /* Include Internet Config module */
+#define USE_IC /* Include Internet Config module */
#define USE_PYEXPAT /* Include Pyexpat module */
#define USE_APPEARANCE /* Enable Appearance support */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index af0b85d..a6d8159 100644
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -249,7 +249,7 @@
(":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"),
(":Mac:Build:calldll.carbon.mcp", "calldll.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:zlib.carbon.mcp", "zlib.carbon"),
## (":Mac:Build:_tkinter.mcp", "_tkinter.carbon"),
diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index bacdb71..3986771 100644
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -174,6 +174,8 @@
genpluginproject("ppc", "icglue", sources=["icgluemodule.c"],
libraries=["ICGlueCFM-PPC.lib"],
extradirs=["::::ICProgKit1.4:APIs"])
+ genpluginproject("carbon", "icglue", sources=["icgluemodule.c"],
+ extradirs=["::::ICProgKit1.4:APIs"])
genpluginproject("ppc", "macspeech", libraries=["SpeechLib"])
if __name__ == '__main__':