From e1dc67e4e46ae38547b023c895f376f461643958 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Thu, 4 Jan 2018 23:51:32 -0500 Subject: [PATCH] Unix-friendly pathname separators and option markers for Watcom, after Tee-Kiah Chia. Not tested under Linux by me, yet. --- dos/wccdos16.mak | 18 +++++++++--------- dos/wccdos4g.mak | 18 +++++++++--------- os2/wccos2.mak | 18 +++++++++--------- watcom.mif | 4 ++-- win32/wccwin32.mak | 22 +++++++++++----------- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dos/wccdos16.mak b/dos/wccdos16.mak index 6d97e5d7..3ff89370 100644 --- a/dos/wccdos16.mak +++ b/dos/wccdos16.mak @@ -1,6 +1,6 @@ # Watcom WMAKE Makefile for PDCurses library - DOS (16 bit) Open Watcom 1.8+ # -# Usage: wmake -f [path\]wccdos16.mak [DEBUG=Y] [target] +# Usage: wmake -f [path/]wccdos16.mak [DEBUG=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] @@ -14,26 +14,26 @@ PDCURSES_SRCDIR = $(%PDCURSES_SRCDIR) PDCURSES_SRCDIR = .. !endif -!include $(PDCURSES_SRCDIR)\version.mif +!include $(PDCURSES_SRCDIR)/version.mif -osdir = $(PDCURSES_SRCDIR)\dos +osdir = $(PDCURSES_SRCDIR)/dos CC = wcc TARGET = dos -CFLAGS = /bt=$(TARGET) /zq /wx /m$(MODEL) /i=$(PDCURSES_SRCDIR) +CFLAGS = -bt=$(TARGET) -zq -wx -m$(MODEL) -i=$(PDCURSES_SRCDIR) !ifeq DEBUG Y -CFLAGS += /d2 /DPDCDEBUG +CFLAGS += -d2 -DPDCDEBUG LDFLAGS = D W A op q sys $(TARGET) !else -CFLAGS += /oneatx +CFLAGS += -oneatx LDFLAGS = op q sys $(TARGET) !endif -LIBEXE = wlib /q /n /t +LIBEXE = wlib -q -n -t -!include $(PDCURSES_SRCDIR)\watcom.mif +!include $(PDCURSES_SRCDIR)/watcom.mif $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) %write wccdos.lrf $(LIBOBJS) $(PDCOBJS) @@ -45,4 +45,4 @@ PLATFORM1 = Watcom C++ 16-bit DOS PLATFORM2 = Open Watcom 2.0 for 16-bit DOS ARCNAME = pdc$(VER)16w -!include $(PDCURSES_SRCDIR)\makedist.mif +!include $(PDCURSES_SRCDIR)/makedist.mif diff --git a/dos/wccdos4g.mak b/dos/wccdos4g.mak index 13323396..4ae17a31 100644 --- a/dos/wccdos4g.mak +++ b/dos/wccdos4g.mak @@ -1,6 +1,6 @@ # Watcom WMAKE Makefile for PDCurses library - DOS/4GW Open Watcom 1.8+ # -# Usage: wmake -f [path\]wccdos4g.mak [DEBUG=Y] [target] +# Usage: wmake -f [path/]wccdos4g.mak [DEBUG=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] @@ -11,26 +11,26 @@ PDCURSES_SRCDIR = $(%PDCURSES_SRCDIR) PDCURSES_SRCDIR = .. !endif -!include $(PDCURSES_SRCDIR)\version.mif +!include $(PDCURSES_SRCDIR)/version.mif -osdir = $(PDCURSES_SRCDIR)\dos +osdir = $(PDCURSES_SRCDIR)/dos CC = wcc386 TARGET = dos4g -CFLAGS = /bt=$(TARGET) /zq /wx /mf /i=$(PDCURSES_SRCDIR) +CFLAGS = -bt=$(TARGET) -zq -wx -mf -i=$(PDCURSES_SRCDIR) !ifeq DEBUG Y -CFLAGS += /d2 /DPDCDEBUG +CFLAGS += -d2 -DPDCDEBUG LDFLAGS = D W A op q sys $(TARGET) !else -CFLAGS += /oneatx +CFLAGS += -oneatx LDFLAGS = op q sys $(TARGET) !endif -LIBEXE = wlib /q /n /t +LIBEXE = wlib -q -n -t -!include $(PDCURSES_SRCDIR)\watcom.mif +!include $(PDCURSES_SRCDIR)/watcom.mif $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) %write wccdos.lrf $(LIBOBJS) $(PDCOBJS) @@ -42,4 +42,4 @@ PLATFORM1 = Watcom C++ 32-bit DOS PLATFORM2 = Open Watcom 2.0 for 32-bit DOS ARCNAME = pdc$(VER)32w -!include $(PDCURSES_SRCDIR)\makedist.mif +!include $(PDCURSES_SRCDIR)/makedist.mif diff --git a/os2/wccos2.mak b/os2/wccos2.mak index 257b8370..f3c58fe7 100644 --- a/os2/wccos2.mak +++ b/os2/wccos2.mak @@ -1,6 +1,6 @@ # Watcom WMAKE Makefile for PDCurses library - OS/2 Open Watcom 1.8+ # -# Usage: wmake -f [path\]wccos2.mak [DEBUG=Y] [target] +# Usage: wmake -f [path/]wccos2.mak [DEBUG=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] @@ -11,26 +11,26 @@ PDCURSES_SRCDIR = $(%PDCURSES_SRCDIR) PDCURSES_SRCDIR = .. !endif -!include $(PDCURSES_SRCDIR)\version.mif +!include $(PDCURSES_SRCDIR)/version.mif -osdir = $(PDCURSES_SRCDIR)\os2 +osdir = $(PDCURSES_SRCDIR)/os2 CC = wcc386 TARGET = os2v2 -CFLAGS = /bt=$(TARGET) /wx /s /zq /i=$(PDCURSES_SRCDIR) +CFLAGS = -bt=$(TARGET) -wx -s -zq -i=$(PDCURSES_SRCDIR) !ifeq DEBUG Y -CFLAGS += /d2 /DPDCDEBUG +CFLAGS += -d2 -DPDCDEBUG LDFLAGS = D A op q sys $(TARGET) !else -CFLAGS += /oneatx +CFLAGS += -oneatx LDFLAGS = op q sys $(TARGET) !endif -LIBEXE = wlib /q /n /b /c /t +LIBEXE = wlib -q -n -b -c -t -!include $(PDCURSES_SRCDIR)\watcom.mif +!include $(PDCURSES_SRCDIR)/watcom.mif $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $@ $(LIBOBJS) $(PDCOBJS) @@ -40,4 +40,4 @@ PLATFORM1 = Watcom C++ OS/2 PLATFORM2 = Open Watcom 2.0 for OS/2 ARCNAME = pdc$(VER)_wcc_os2 -!include $(PDCURSES_SRCDIR)\makedist.mif +!include $(PDCURSES_SRCDIR)/makedist.mif diff --git a/watcom.mif b/watcom.mif index d0bab8d9..54747f40 100644 --- a/watcom.mif +++ b/watcom.mif @@ -1,7 +1,7 @@ # Common elements for the Watcom makefiles -srcdir = $(PDCURSES_SRCDIR)\pdcurses -demodir = $(PDCURSES_SRCDIR)\demos +srcdir = $(PDCURSES_SRCDIR)/pdcurses +demodir = $(PDCURSES_SRCDIR)/demos LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj & border.obj clear.obj color.obj delch.obj deleteln.obj deprec.obj & diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak index 14dc55ef..10b9928c 100644 --- a/win32/wccwin32.mak +++ b/win32/wccwin32.mak @@ -1,6 +1,6 @@ # Watcom WMAKE Makefile for PDCurses library - Win32 Open Watcom 1.8+ # -# Usage: wmake -f [win32\]wccwin32.mak [DEBUG=Y] [WIDE=Y] [UTF8=Y] [target] +# Usage: wmake -f [win32/]wccwin32.mak [DEBUG=Y] [WIDE=Y] [UTF8=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] @@ -11,34 +11,34 @@ PDCURSES_SRCDIR = $(%PDCURSES_SRCDIR) PDCURSES_SRCDIR = .. !endif -!include $(PDCURSES_SRCDIR)\version.mif +!include $(PDCURSES_SRCDIR)/version.mif -osdir = $(PDCURSES_SRCDIR)\win32 +osdir = $(PDCURSES_SRCDIR)/win32 CC = wcc386 TARGET = nt -CFLAGS = /ei /zq /wx /i=$(PDCURSES_SRCDIR) +CFLAGS = -ei -zq -wx -i=$(PDCURSES_SRCDIR) !ifeq DEBUG Y -CFLAGS += /d2 /DPDCDEBUG +CFLAGS += -d2 -DPDCDEBUG LDFLAGS = D W A op q sys $(TARGET) !else -CFLAGS += /oneatx +CFLAGS += -oneatx LDFLAGS = op q sys $(TARGET) !endif !ifeq WIDE Y -CFLAGS += /DPDC_WIDE +CFLAGS += -DPDC_WIDE !endif !ifeq UTF8 Y -CFLAGS += /DPDC_FORCE_UTF8 +CFLAGS += -DPDC_FORCE_UTF8 !endif -LIBEXE = wlib /q /n /t +LIBEXE = wlib -q -n -t -!include $(PDCURSES_SRCDIR)\watcom.mif +!include $(PDCURSES_SRCDIR)/watcom.mif $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $@ $(LIBOBJS) $(PDCOBJS) @@ -48,4 +48,4 @@ PLATFORM1 = Watcom C++ Win32 PLATFORM2 = Open Watcom 2.0 for Win32 ARCNAME = pdc$(VER)_wcc_w32 -!include $(PDCURSES_SRCDIR)\makedist.mif +!include $(PDCURSES_SRCDIR)/makedist.mif