From 034936e8a91d9ef772a1a2d135815c2f17b7004b Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 16 Mar 2006 17:29:00 +0000 Subject: [PATCH] Added files and made modifications for R3.13 Makefile builds of extensions. --- config/CONFIG.Host.cygwin-x86 | 13 +++++++++++++ config/CONFIG.Host.cygwin32 | 17 +++++++++++++++-- config/CONFIG_HOST_ARCH.cygwin-x86 | 23 +++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 config/CONFIG.Host.cygwin-x86 create mode 100644 config/CONFIG_HOST_ARCH.cygwin-x86 diff --git a/config/CONFIG.Host.cygwin-x86 b/config/CONFIG.Host.cygwin-x86 new file mode 100644 index 000000000..d3ede1fda --- /dev/null +++ b/config/CONFIG.Host.cygwin-x86 @@ -0,0 +1,13 @@ +#************************************************************************* +# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# National Laboratory. +# Copyright (c) 2002 The Regents of the University of California, as +# Operator of Los Alamos National Laboratory. +# EPICS BASE Versions 3.13.7 +# and higher are distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* +# $Id$ + +# cygwin-x86 is the new name for cygwin32 +-include $(EPICS_BASE)/config/CONFIG.Host.cygwin32 diff --git a/config/CONFIG.Host.cygwin32 b/config/CONFIG.Host.cygwin32 index 944708441..cdae20d8c 100644 --- a/config/CONFIG.Host.cygwin32 +++ b/config/CONFIG.Host.cygwin32 @@ -20,6 +20,17 @@ include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon EXE=.exe +#========================== +#These overrides remove -ansi because -ansi eliminates strdup +GCC_ANSI = $(GCC) +GCC_STRICT = $(GCC) -pedantic +G++_NORMAL = $(G++) -pedantic +G++_STRICT = $(G++) -pedantic + +#========================== +#This override will eliminate warnings for old R3.13 extensions +#GCC_WARN_YES = + #========================== # These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE # since OS vendor compilers ACC and CCC are not defined here for cygwin32 @@ -32,7 +43,7 @@ SHARED_LIBRARIES=NO #OP_SYS_INCLUDES += /usr/local/include/g++ #========================== -ARCH_DEP_CFLAGS = -DCYGWIN32 -U_WIN32 +ARCH_DEP_CPPFLAGS = -DCYGWIN32 -U_WIN32 ARCH_DEP_LDLIBS = OP_SYS_LDLIBS = @@ -41,7 +52,9 @@ OP_SYS_LDLIBS = GCC_DEP_CFLAGS = -D_REENTRANT G++_DEP_CFLAGS = -D_REENTRANT -POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE +#POSIX_SOURCE eliminates select() +#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE +POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS # Runtime ldflags RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\ diff --git a/config/CONFIG_HOST_ARCH.cygwin-x86 b/config/CONFIG_HOST_ARCH.cygwin-x86 new file mode 100644 index 000000000..28ffe187c --- /dev/null +++ b/config/CONFIG_HOST_ARCH.cygwin-x86 @@ -0,0 +1,23 @@ +#************************************************************************* +# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# National Laboratory. +# Copyright (c) 2002 The Regents of the University of California, as +# Operator of Los Alamos National Laboratory. +# EPICS BASE Versions 3.13.7 +# and higher are distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* +# CONFIG_HOST_ARCH.cygwin-x86 +# +# This file is maintained by the EPICS community. + +# Include definitions common to all Unix archs +-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon + +EXE=.exe +HOSTEXE=.exe + +TORNADO=YES + +WIND_HOST_TYPE = x86-win32 +