diff options
| author | Guido van Rossum <guido@python.org> | 1999-12-16 17:52:08 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1999-12-16 17:52:08 (GMT) |
| commit | 4e08379891ba67b93fb9d238e4c064ab92c81787 (patch) | |
| tree | f9e4baed7a07aee573d66ac3acf6864724ef3da5 | |
| parent | 9501219303c6c480e452ed9b34353db71a7bb4a2 (diff) | |
| download | cpython-4e08379891ba67b93fb9d238e4c064ab92c81787.zip cpython-4e08379891ba67b93fb9d238e4c064ab92c81787.tar.gz cpython-4e08379891ba67b93fb9d238e4c064ab92c81787.tar.bz2 | |
Patch and new file by Geoff Furnish for C++ compilation.
| -rw-r--r-- | Modules/Makefile.pre.in | 8 | ||||
| -rw-r--r-- | Modules/ccpython.cc | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in index f25f204..389227c 100644 --- a/Modules/Makefile.pre.in +++ b/Modules/Makefile.pre.in @@ -17,7 +17,7 @@ VERSION= @VERSION@ srcdir= @srcdir@ VPATH= @srcdir@ -@SET_CCC@ +@SET_CXX@ CC= @CC@ RANLIB= @RANLIB@ AR= @AR@ @@ -95,7 +95,8 @@ MAKESETUP= $(srcdir)/makesetup FIXOBJS= config.o getpath.o main.o getbuildinfo.o OBJS= $(MODOBJS) $(FIXOBJS) -MAINOBJ= python.o +#MAINOBJ= python.o +MAINOBJ= @MAINOBJ@ SYSLIBS= $(LIBM) $(LIBC) @@ -243,4 +244,7 @@ $(DESTSHARED): fi; \ done +ccpython.o: ccpython.cc + $(CXX) $(CFLAGS) -c $*.cc + # Stuff is appended here by makesetup and make depend diff --git a/Modules/ccpython.cc b/Modules/ccpython.cc new file mode 100644 index 0000000..a6e97ff --- /dev/null +++ b/Modules/ccpython.cc @@ -0,0 +1,11 @@ +/* Minimal main program -- everything is loaded from the library */ + +#include "Python.h" + +extern "C" +DL_EXPORT(int) Py_Main( int argc, char *argv[] ); + +int main( int argc, char *argv[] ) +{ + return Py_Main(argc, argv); +} |