From 059b34c62635911fc8d49cfbbed721e53ba29594 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 15 Nov 2005 22:22:27 +0000 Subject: [PATCH] Override -DUNIX from CONFIG.Common.UnixCommon. Added readline defines. --- configure/os/CONFIG.Common.win32-x86-cygwin | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure/os/CONFIG.Common.win32-x86-cygwin b/configure/os/CONFIG.Common.win32-x86-cygwin index 92af786a5..c8bde373b 100644 --- a/configure/os/CONFIG.Common.win32-x86-cygwin +++ b/configure/os/CONFIG.Common.win32-x86-cygwin @@ -20,7 +20,9 @@ COMPILER_CPPFLAGS = -D_REENTRANT # Set runtime path for shared libraries RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%) -# Library used when COMMANDLINE_LIBRARY is READLINE +# Definitions used when COMMANDLINE_LIBRARY is READLINE +INCLUDES_READLINE = -I$(GNU_DIR)/include +LDFLAGS_READLINE += -L$(GNU_DIR)/lib LDLIBS_READLINE = -lreadline OP_SYS_CXXFLAGS += -D__cplusplus @@ -37,7 +39,9 @@ OP_SYS_CXXFLAGS += -D__cplusplus # compiler does not define __unix __unix__ unix # compiler does not define __CYGWIN__ __CYGWIN32__ -OP_SYS_CPPFLAGS += -mno-cygwin +# Overrides -DUNIX from CONFIG.Common.UnixCommon +OP_SYS_CPPFLAGS = -mno-cygwin + OP_SYS_LDFLAGS += -mno-cygwin OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm