Change enviroment test order to prevent use DJGPP options in cygwin

This commit is contained in:
Stas Degteff 2005-04-26 09:49:22 +00:00
parent 27fd911b0a
commit 6e8413f4e1
3 changed files with 16 additions and 16 deletions

View File

@ -8,6 +8,18 @@ MINGW=true
endif endif
endif endif
ifdef MINGW
CAT=cat
CC=gcc -mno-cygwin
CXX=g++ -mno-cygwin
AR=ar
RANLIB=ranlib
WINDRES=windres
PLATFORM=cyg
EXEEXT=.exe
OBJEXT=.o
LIBEXT=.a
else
ifeq ($(findstring EMX, $(PATH)), EMX) ifeq ($(findstring EMX, $(PATH)), EMX)
CAT=cat CAT=cat
CC=gcc CC=gcc
@ -40,18 +52,6 @@ EXEEXT=.exe
OBJEXT=.o OBJEXT=.o
LIBEXT=.a LIBEXT=.a
else else
ifdef MINGW
CAT=cat
CC=gcc -mno-cygwin
CXX=g++ -mno-cygwin
AR=ar
RANLIB=ranlib
WINDRES=windres
PLATFORM=cyg
EXEEXT=.exe
OBJEXT=.o
LIBEXT=.a
else
ifeq ($(OSTYPE),beos) # BeOS build ifeq ($(OSTYPE),beos) # BeOS build
CAT=cat CAT=cat
CC=gcc CC=gcc

View File

@ -27,7 +27,7 @@ bld$(PLATFORM).inc: $(TARGET).all
$(FOBJPATH)/%$(OBJEXT): %.cpp $(FOBJPATH)/%$(OBJEXT): %.cpp
@echo building $(basename $<)$(OBJEXT) @echo building $(basename $<)$(OBJEXT)
@$(CXX) -c -MD $(CPPFLAGS) -o $@ $< $(CXX) -c -MD $(CPPFLAGS) -o $@ $<
@$(SHELL) -c "[ -s $(patsubst %.cpp,%.d,$<) ] && \ @$(SHELL) -c "[ -s $(patsubst %.cpp,%.d,$<) ] && \
echo -n $(FOBJPATH)/>$(FDEPPATH)/$(patsubst %.cpp,%.d,$<) && \ echo -n $(FOBJPATH)/>$(FDEPPATH)/$(patsubst %.cpp,%.d,$<) && \
$(CAT) $(patsubst %.cpp,%.d,$<)>>$(FDEPPATH)/$(patsubst %.cpp,%.d,$<) &&\ $(CAT) $(patsubst %.cpp,%.d,$<)>>$(FDEPPATH)/$(patsubst %.cpp,%.d,$<) &&\
@ -35,7 +35,7 @@ $(FOBJPATH)/%$(OBJEXT): %.cpp
$(FOBJPATH)/%$(OBJEXT): %.c $(FOBJPATH)/%$(OBJEXT): %.c
@echo building $(basename $<)$(OBJEXT) @echo building $(basename $<)$(OBJEXT)
@$(CC) -c -MD $(CFLAGS) -o $@ $< $(CC) -c -MD $(CFLAGS) -o $@ $<
@$(SHELL) -c "[ -s $(patsubst %.c,%.d,$<) ] && \ @$(SHELL) -c "[ -s $(patsubst %.c,%.d,$<) ] && \
echo -n $(FOBJPATH)/>$(FDEPPATH)/$(patsubst %.c,%.d,$<) && \ echo -n $(FOBJPATH)/>$(FDEPPATH)/$(patsubst %.c,%.d,$<) && \
$(CAT) $(patsubst %.c,%.d,$<)>>$(FDEPPATH)/$(patsubst %.c,%.d,$<) && \ $(CAT) $(patsubst %.c,%.d,$<)>>$(FDEPPATH)/$(patsubst %.c,%.d,$<) && \

View File

@ -11,10 +11,10 @@ endif
TOP=../.. TOP=../..
TARGET=gall TARGET=gall
INCS=-I$(TOP)/goldlib/gall INCS=-I$(TOP)/goldlib/gall
ifeq ($(findstring EMX, $(PATH)), EMX) ifdef MINGW
INCS+=-I$(TOP)/goldlib/glibc INCS+=-I$(TOP)/goldlib/glibc
else else
ifdef MINGW ifeq ($(findstring EMX, $(PATH)), EMX)
INCS+=-I$(TOP)/goldlib/glibc INCS+=-I$(TOP)/goldlib/glibc
endif endif
endif endif