From 0a5ddd49bace76f24e420b2ce4dc23aac771ad03 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 22 Mar 2001 21:21:40 +0000 Subject: [PATCH] Rearranged OP_SYS and ARCH_DEP definitions. --- configure/os/CONFIG.Common.win32-x86-cygwin | 8 +++++--- configure/os/CONFIG.win32-x86-borland.win32-x86-borland | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure/os/CONFIG.Common.win32-x86-cygwin b/configure/os/CONFIG.Common.win32-x86-cygwin index 1cf590e7e..192cb3c90 100644 --- a/configure/os/CONFIG.Common.win32-x86-cygwin +++ b/configure/os/CONFIG.Common.win32-x86-cygwin @@ -22,7 +22,9 @@ POSIX_CPPFLAGS_NO = POSIX_LDLIBS_NO = # -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp. -ARCH_DEP_CPPFLAGS += -DCYGWIN32 -U_WIN32 -ARCH_DEP_LDFLAGS = -####ARCH_DEP_LDLIBS = -lreadline -lcurses -lrt +OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32 +OP_SYS_LDFLAGS = +####OP_SYS_LDLIBS = -lreadline -lcurses -lrt + +ARCH_DEP_CPPFLAGS += -D_X86_ diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland index c57ba6ece..7e698ae17 100644 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland @@ -143,7 +143,6 @@ LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w- WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) OPT_LDFLAGS = - ARCH_DEP_CFLAGS= # to identify the general architecture class: @@ -172,7 +171,7 @@ OP_SYS_CFLAGS = # # Borland specific include files # -OP_SYS_INCLUDES = -I$(BORLAND_INC) +#OP_SYS_INCLUDES = -I$(BORLAND_INC) # OP_SYS_LDLIBS =