From 54f7068737f8ce75dff06a68b88dc5e6e2e3d024 Mon Sep 17 00:00:00 2001 From: rrt Date: Tue, 3 Apr 2001 16:43:28 +0000 Subject: [PATCH] [project @ 2001-04-03 16:43:28 by rrt] Move Windows options to The Right Place. --- mk/config.mk.in | 3 +++ mk/opts.mk | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index 5b99e95..31dd776 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -582,6 +582,9 @@ endif # default C compiler flags SRC_CC_OPTS = -O +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +SRC_CC_OPTS += -mno-cygwin -mwin32 +endif #----------------------------------------------------------------------------- # GMP Library (version 2.0.x or above) diff --git a/mk/opts.mk b/mk/opts.mk index cef3052..36f0c7d 100644 --- a/mk/opts.mk +++ b/mk/opts.mk @@ -5,7 +5,7 @@ # This file defines Make variables for the # option flags for each utility program # -# $Id: opts.mk,v 1.19 2001/04/03 16:30:43 rrt Exp $ +# $Id: opts.mk,v 1.20 2001/04/03 16:43:28 rrt Exp $ # ################################################################################# @@ -86,9 +86,6 @@ BLD_DLL_OPTS = $(SRC_BLD_DLL_OPTS) $(WAY$(_way)_BLD_DLL_OPTS) $($*_HC_OPTS CPP_OPTS = $(SRC_CPP_OPTS) $(WAY$(_way)_CPP_OPTS) $(EXTRA_CPP_OPTS) CTAGS_OPTS = $(SRC_CTAGS_OPTS) $(WAY$(_way)_CTAGS_OPTS) $(EXTRA_CTAGS_OPTS) CC_OPTS = $(SRC_CC_OPTS) $(WAY$(_way)_CC_OPTS) $($*_CC_OPTS) $(EXTRA_CC_OPTS) -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -CC_OPTS += -mno-cygwin -mwin32 -endif FLEX_OPTS = $(SRC_FLEX_OPTS) $(WAY$(_way)_FLEX_OPTS) $(EXTRA_FLEX_OPTS) HAPPY_OPTS = $(SRC_HAPPY_OPTS) $(WAY$(_way)_HAPPY_OPTS) $($*_HAPPY_OPTS) $(EXTRA_HAPPY_OPTS) GC_OPTS = $(SRC_GC_OPTS) $(WAY$(_way)_GC_OPTS) $($*_GC_OPTS) $(EXTRA_GC_OPTS) -- 1.7.10.4