Detect msys by OSTYPE as well

This commit is contained in:
Alexander S. Aganichev 2003-12-22 08:02:19 +00:00
parent 3b37290f9c
commit 49adbfab72
5 changed files with 45 additions and 5 deletions

View File

@ -1,5 +1,13 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys)
MSYS=true
else
ifeq ($(OSTYPE),msys)
MSYS=true
endif
endif
ifeq ($(findstring EMX, $(PATH)), EMX) ifeq ($(findstring EMX, $(PATH)), EMX)
CAT=cat CAT=cat
CC=gcc CC=gcc
@ -45,7 +53,7 @@ EXEEXT=.exe
OBJEXT=.o OBJEXT=.o
LIBEXT=.a LIBEXT=.a
else else
ifeq ($(TERM),msys) ifdef MSYS
CAT=cat CAT=cat
CC=gcc CC=gcc
CXX=g++ CXX=g++

View File

@ -1,5 +1,13 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys)
MSYS=true
else
ifeq ($(OSTYPE),msys)
MSYS=true
endif
endif
TOP=.. TOP=..
SHORTTARGET=ged SHORTTARGET=ged
TARGET=golded3 TARGET=golded3
@ -14,7 +22,7 @@ ifeq ($(TERM),cygwin)
STDLIBS=-luser32 -lwinmm STDLIBS=-luser32 -lwinmm
GLIBS+=glibc GLIBS+=glibc
else else
ifeq ($(TERM),msys) ifdef MSYS
STDLIBS=-luser32 -lwinmm STDLIBS=-luser32 -lwinmm
GLIBS+=glibc GLIBS+=glibc
endif endif

View File

@ -1,5 +1,13 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys)
MSYS=true
else
ifeq ($(OSTYPE),msys)
MSYS=true
endif
endif
TOP=../.. TOP=../..
TARGET=gall TARGET=gall
INCS=-I$(TOP)/goldlib/gall INCS=-I$(TOP)/goldlib/gall
@ -9,7 +17,7 @@ else
ifeq ($(TERM),cygwin) ifeq ($(TERM),cygwin)
INCS+=-I$(TOP)/goldlib/glibc INCS+=-I$(TOP)/goldlib/glibc
else else
ifeq ($(TERM),msys) ifdef MSYS
INCS+=-I$(TOP)/goldlib/glibc INCS+=-I$(TOP)/goldlib/glibc
endif endif
endif endif

View File

@ -1,5 +1,13 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys)
MSYS=true
else
ifeq ($(OSTYPE),msys)
MSYS=true
endif
endif
TOP=.. TOP=..
SHORTTARGET=gn SHORTTARGET=gn
TARGET=goldnode TARGET=goldnode
@ -10,7 +18,7 @@ else
ifeq ($(TERM),cygwin) ifeq ($(TERM),cygwin)
STDLIBS=-luser32 STDLIBS=-luser32
else else
ifeq ($(TERM),msys) ifdef MSYS
STDLIBS=-luser32 STDLIBS=-luser32
endif endif
endif endif

View File

@ -1,5 +1,13 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys)
MSYS=true
else
ifeq ($(OSTYPE),msys)
MSYS=true
endif
endif
TOP=.. TOP=..
SHORTTARGET=rddt SHORTTARGET=rddt
TARGET=rddt TARGET=rddt
@ -10,7 +18,7 @@ else
ifeq ($(TERM),cygwin) ifeq ($(TERM),cygwin)
STDLIBS=-luser32 STDLIBS=-luser32
else else
ifeq ($(TERM),msys) ifdef MSYS
STDLIBS=-luser32 STDLIBS=-luser32
endif endif
endif endif