From e8d28bb3055de955a43c7d7a8b820a0932ef9577 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Tue, 19 Dec 2017 10:03:03 -0500 Subject: [PATCH] Actually, I'm pretty sure that broke DLLs for EMX, so let's drop that support. --- os2/README.md | 5 ----- os2/gccos2.mak | 33 +++++++-------------------------- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/os2/README.md b/os2/README.md index 45043c77..c526add9 100644 --- a/os2/README.md +++ b/os2/README.md @@ -31,11 +31,6 @@ Building library, provided for convenience; both panel and curses functions are in the main library. - You can also use the optional parameter "DLL=Y" with EMX, to build the - library as a DLL: - - make -f gccos2.mak DLL=Y - Distribution Status ------------------- diff --git a/os2/gccos2.mak b/os2/gccos2.mak index 09cf1017..cf7e79b0 100644 --- a/os2/gccos2.mak +++ b/os2/gccos2.mak @@ -1,6 +1,6 @@ # GNU MAKE Makefile for PDCurses library - OS/2 emx 0.9c+ # -# Usage: make -f [path\]gccos2.mak [DEBUG=Y] [EMXVIDEO=Y] [DLL=Y] [target] +# Usage: make -f [path\]gccos2.mak [DEBUG=Y] [EMXVIDEO=Y] [target] # # where target can be any of: # [all|demos|pdcurses.a|testcurs.exe...] @@ -42,9 +42,6 @@ else LDFLAGS = endif -DLLTARGET = pdcurses.dll -DLLFLAGS = -Zdll -Zcrtdll -Zomf - LINK = gcc EMXBIND = emxbind EMXOMF = emxomf @@ -52,23 +49,12 @@ EMXOMF = emxomf LIBEXE = ar LIBFLAGS = rcv -ifeq ($(DLL),Y) - CFLAGS += -Zdll -Zcrtdll -Zomf - LDFLAGS += -Zlinker /PM:VIO -Zomf -Zcrtdll - LIBCURSES = pdcurses.lib - LIBDEPS = $(LIBOBJS) $(PDCOBJS) - PDCLIBS = $(DLLTARGET) - EXEPOST = - TUIPOST = - CLEAN = *.dll *.lib -else - LIBCURSES = pdcurses.a - LIBDEPS = $(LIBOBJS) $(PDCOBJS) - PDCLIBS = $(LIBCURSES) - EXEPOST = $(EMXBIND) $* $(BINDFLAGS) - TUIPOST = $(EMXBIND) tuidemo $(BINDFLAGS) - CLEAN = *.a testcurs newdemo xmas tuidemo firework ptest rain worm -endif +LIBCURSES = pdcurses.a +LIBDEPS = $(LIBOBJS) $(PDCOBJS) +PDCLIBS = $(LIBCURSES) +EXEPOST = $(EMXBIND) $* $(BINDFLAGS) +TUIPOST = $(EMXBIND) tuidemo $(BINDFLAGS) +CLEAN = *.a testcurs newdemo xmas tuidemo firework ptest rain worm .PHONY: all libs clean demos dist @@ -90,11 +76,6 @@ $(LIBCURSES) : $(LIBDEPS) $(LIBEXE) $(LIBFLAGS) $@ $? -copy $(LIBCURSES) panel.a -$(DLLTARGET) : $(LIBDEPS) - $(LINK) $(DLLFLAGS) -o $(DLLTARGET) $? -# lxlite $(DLLTARGET) - emximp -o $(LIBCURSES) - $(LIBOBJS) $(PDCOBJS) $(DEMOOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_OS2_H) $(DEMOS) : $(LIBCURSES)