mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 15:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

- add build support for curses extension to be a normal DLL as well as

Browse source 
a Python extension, so that the curses_panel extension works.
- minor compiler switch tweak.
This commit is contained in:
Andrew MacIntyre 2003-12-02 12:21:20 +00:00
parent 63ee110cf7
commit 51578ae43d
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
PC/os2emx/Makefile
View file

@ -91,7 +91,7 @@ ifeq ($(MODE),debug)
CFLAGS+= -g -O CFLAGS+= -g -O
LDFLAGS+= -g LDFLAGS+= -g
else else
CFLAGS+= -s -O3 -fomit-frame-pointer CFLAGS+= -s -O3 -fomit-frame-pointer -mprobe
LDFLAGS+= -s LDFLAGS+= -s
endif endif
CFLAGS+= $(PY_DEF) CFLAGS+= $(PY_DEF)
@ -113,6 +113,7 @@ EXEOMF= no
# File extensions # File extensions
MODULE.EXT= .pyd MODULE.EXT= .pyd
MODLIB.EXT= .dll
ifeq ($(OMF),yes) ifeq ($(OMF),yes)
O= .obj O= .obj
A= .lib A= .lib
@ -253,7 +254,7 @@ DESCRIPTION._tkinter$(MODULE.EXT)= Python Extension DLL for access to Tcl/Tk Env
DESCRIPTION.mpz$(MODULE.EXT)= Python Extension DLL for access to GNU multi-precision library DESCRIPTION.mpz$(MODULE.EXT)= Python Extension DLL for access to GNU multi-precision library
DESCRIPTION.readline$(MODULE.EXT)= Python Extension DLL for access to GNU ReadLine library DESCRIPTION.readline$(MODULE.EXT)= Python Extension DLL for access to GNU ReadLine library
DESCRIPTION.bsddb185$(MODULE.EXT)= Python Extension DLL for access to BSD DB (v1.85) library DESCRIPTION.bsddb185$(MODULE.EXT)= Python Extension DLL for access to BSD DB (v1.85) library
DESCRIPTION._curses$(MODULE.EXT)= Python Extension DLL for access to ncurses library DESCRIPTION._curses$(MODLIB.EXT)= Python Extension DLL for access to ncurses library
DESCRIPTION.pyexpat$(MODULE.EXT)= Python Extension DLL for access to expat library DESCRIPTION.pyexpat$(MODULE.EXT)= Python Extension DLL for access to expat library
DESCRIPTION.bz2$(MODULE.EXT)= Python Extension DLL for accessing the bz2 compression library DESCRIPTION.bz2$(MODULE.EXT)= Python Extension DLL for accessing the bz2 compression library
@ -429,6 +430,10 @@ HARDEXTMODULES= _hotshot \
_testcap \ _testcap \
unicoded unicoded
# Python modules that are used as libraries and therefore must use
# a .DLL extension
LIBEXTMODULES=
# Python external ($(MODULE.EXT)) modules - can be EASY or HARD # Python external ($(MODULE.EXT)) modules - can be EASY or HARD
ifeq ($(HAVE_ZLIB),yes) ifeq ($(HAVE_ZLIB),yes)
HARDEXTMODULES+= zlib HARDEXTMODULES+= zlib
@ -451,7 +456,8 @@ ifeq ($(HAVE_BSDDB),yes)
HARDEXTMODULES+= bsddb185 HARDEXTMODULES+= bsddb185
endif endif
ifeq ($(HAVE_NCURSES),yes) ifeq ($(HAVE_NCURSES),yes)
HARDEXTMODULES+= _curses _curses_ LIBEXTMODULES+= _curses
HARDEXTMODULES+= _curses_
endif endif
ifeq ($(HAVE_GDBM),yes) ifeq ($(HAVE_GDBM),yes)
HARDEXTMODULES+= gdbm dbm HARDEXTMODULES+= gdbm dbm
@ -473,6 +479,7 @@ EXPAT.SRC= $(addprefix ../../Modules/expat/, \
# all the external modules # all the external modules
EXTERNDLLS= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(EASYEXTMODULES))) EXTERNDLLS= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(EASYEXTMODULES)))
EXTERNDLLS+= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(HARDEXTMODULES))) EXTERNDLLS+= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(HARDEXTMODULES)))
EXTERNDLLS+= $(addsuffix $(MODLIB.EXT),$(patsubst %module,%,$(LIBEXTMODULES)))
# Targets # Targets
all: $(OUT) $(PYTHON.LIB) $(PYTHON.DEF) $(PYTHON.IMPLIB) $(PYTHON.DLL) \ all: $(OUT) $(PYTHON.LIB) $(PYTHON.DEF) $(PYTHON.IMPLIB) $(PYTHON.DLL) \
@ -583,7 +590,7 @@ crypt$(MODULE.EXT): $(OUT)cryptmodule$O $(OUT)crypt_m.def $(PYTHON.IMPLIB)
$(OUT)_curses_m.def: $(OUT)_curses_m.def:
@echo Creating .DEF file: $@ @echo Creating .DEF file: $@
@echo LIBRARY $(notdir $*) INITINSTANCE TERMINSTANCE >$@ @echo LIBRARY $(notdir $*) INITINSTANCE TERMINSTANCE >$@
@echo DESCRIPTION $(DQUOTE)$(DESCRIPTION.$(notdir $*)$(MODULE.EXT))$(DQUOTE) >>$@ @echo DESCRIPTION $(DQUOTE)$(DESCRIPTION.$(notdir $*)$(MODLIB.EXT))$(DQUOTE) >>$@
@echo DATA MULTIPLE NONSHARED >>$@ @echo DATA MULTIPLE NONSHARED >>$@
@echo EXPORTS >>$@ @echo EXPORTS >>$@
@echo init_curses >>$@ @echo init_curses >>$@
@ -609,7 +616,7 @@ $(OUT)_curses_panel_m.def:
@echo EXPORTS >>$@ @echo EXPORTS >>$@
@echo init_curses_panel >>$@ @echo init_curses_panel >>$@
_curses$(MODULE.EXT): $(OUT)_cursesmodule$O $(OUT)_curses_m.def $(PYTHON.IMPLIB) _curses$(MODLIB.EXT): $(OUT)_cursesmodule$O $(OUT)_curses_m.def $(PYTHON.IMPLIB)
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lncurses $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lncurses
# curses_panel needs to be renamed to be useful # curses_panel needs to be renamed to be useful