diff options
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/custom.c | 6 | ||||
| -rw-r--r-- | custom/customw.c | 6 | ||||
| -rw-r--r-- | custom/mkcustom.py | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/custom/custom.c b/custom/custom.c index f7888af..013f988 100644 --- a/custom/custom.c +++ b/custom/custom.c @@ -14,11 +14,11 @@ int main(int argc, char **argv) * to be a builtin in the custom interpreter. The name of the function * will be the name of the module with "init" prepended. The modules * must be built as static libraries (using the -k flag to configure.py - * for SIP and PyTQt). + * for SIP-TQt and PyTQt). */ /* The sip module will be builtin. */ - extern void initsip(void); + extern void initsip_tqt(void); /* * Uncomment these (and in the structure below) to include the PyTQt @@ -40,7 +40,7 @@ int main(int argc, char **argv) * the builtin modules. */ struct _inittab builtin_modules[] = { - {"sip", initsip}, + {"sip_tqt", initsip_tqt}, /* {"qt", initqt},*/ /* {"qtaxcontainer", initqtaxcontainer},*/ /* {"qtcanvas", initqtcanvas},*/ diff --git a/custom/customw.c b/custom/customw.c index 087a4b9..e554f2b 100644 --- a/custom/customw.c +++ b/custom/customw.c @@ -18,11 +18,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, * to be a builtin in the custom interpreter. The name of the function * will be the name of the module with "init" prepended. The modules * must be built as static libraries (using the -k flag to configure.py - * for SIP and PyTQt). + * for SIP-TQt and PyTQt). */ /* The sip module will be builtin. */ - extern void initsip(void); + extern void initsip_tqt(void); /* * Uncomment these (and in the structure below) to include the PyTQt @@ -44,7 +44,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, * the builtin modules. */ struct _inittab builtin_modules[] = { - {"sip", initsip}, + {"sip_tqt", initsip_tqt}, /* {"qt", initqt},*/ /* {"qtaxcontainer", initqtaxcontainer},*/ /* {"qtcanvas", initqtcanvas},*/ diff --git a/custom/mkcustom.py b/custom/mkcustom.py index 0e8deab..94f7021 100644 --- a/custom/mkcustom.py +++ b/custom/mkcustom.py @@ -1,4 +1,4 @@ -"""This Python script uses the SIP build system to create a Makefile for +"""This Python script uses the SIP-TQt build system to create a Makefile for building a custom Python interpreter. The script doesn't take any command line flags - just edit it to suit your needs. You will also need to edit custom.c or customw.c. @@ -6,11 +6,11 @@ or customw.c. import sys -import sipconfig +import sip_tqt_config -# Get the SIP configuration. -cfg = sipconfig.Configuration() +# Get the SIP-TQt configuration. +cfg = sip_tqt_config.Configuration() # This is the name of the interpreter executable (excluding any platform @@ -50,7 +50,7 @@ if sys.platform == "linux2": # Create a dictionary describing the target and source files to be passed to -# the SIP build system. +# the SIP-TQt build system. build = {} if sys.platform == "win32" and WindowsInterpreter: @@ -66,7 +66,7 @@ else: qt = (cfg.qt_version > 0) # Create the Makefile instance. -mf = sipconfig.ProgramMakefile(cfg, build, python=True, console=console, qt=qt) +mf = sip_tqt_config.ProgramMakefile(cfg, build, python=True, console=console, qt=qt) # Modify the Makefile according to the values set above. mf.extra_lib_dirs.extend(ExtraLibraryDirectories) |