Detect msys by OSTYPE as well
This commit is contained in:
parent
3b37290f9c
commit
49adbfab72
10
GNUmakef.def
10
GNUmakef.def
@ -1,5 +1,13 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
ifeq ($(TERM),msys)
|
||||
MSYS=true
|
||||
else
|
||||
ifeq ($(OSTYPE),msys)
|
||||
MSYS=true
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(findstring EMX, $(PATH)), EMX)
|
||||
CAT=cat
|
||||
CC=gcc
|
||||
@ -45,7 +53,7 @@ EXEEXT=.exe
|
||||
OBJEXT=.o
|
||||
LIBEXT=.a
|
||||
else
|
||||
ifeq ($(TERM),msys)
|
||||
ifdef MSYS
|
||||
CAT=cat
|
||||
CC=gcc
|
||||
CXX=g++
|
||||
|
@ -1,5 +1,13 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
ifeq ($(TERM),msys)
|
||||
MSYS=true
|
||||
else
|
||||
ifeq ($(OSTYPE),msys)
|
||||
MSYS=true
|
||||
endif
|
||||
endif
|
||||
|
||||
TOP=..
|
||||
SHORTTARGET=ged
|
||||
TARGET=golded3
|
||||
@ -14,7 +22,7 @@ ifeq ($(TERM),cygwin)
|
||||
STDLIBS=-luser32 -lwinmm
|
||||
GLIBS+=glibc
|
||||
else
|
||||
ifeq ($(TERM),msys)
|
||||
ifdef MSYS
|
||||
STDLIBS=-luser32 -lwinmm
|
||||
GLIBS+=glibc
|
||||
endif
|
||||
|
@ -1,5 +1,13 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
ifeq ($(TERM),msys)
|
||||
MSYS=true
|
||||
else
|
||||
ifeq ($(OSTYPE),msys)
|
||||
MSYS=true
|
||||
endif
|
||||
endif
|
||||
|
||||
TOP=../..
|
||||
TARGET=gall
|
||||
INCS=-I$(TOP)/goldlib/gall
|
||||
@ -9,7 +17,7 @@ else
|
||||
ifeq ($(TERM),cygwin)
|
||||
INCS+=-I$(TOP)/goldlib/glibc
|
||||
else
|
||||
ifeq ($(TERM),msys)
|
||||
ifdef MSYS
|
||||
INCS+=-I$(TOP)/goldlib/glibc
|
||||
endif
|
||||
endif
|
||||
|
@ -1,5 +1,13 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
ifeq ($(TERM),msys)
|
||||
MSYS=true
|
||||
else
|
||||
ifeq ($(OSTYPE),msys)
|
||||
MSYS=true
|
||||
endif
|
||||
endif
|
||||
|
||||
TOP=..
|
||||
SHORTTARGET=gn
|
||||
TARGET=goldnode
|
||||
@ -10,7 +18,7 @@ else
|
||||
ifeq ($(TERM),cygwin)
|
||||
STDLIBS=-luser32
|
||||
else
|
||||
ifeq ($(TERM),msys)
|
||||
ifdef MSYS
|
||||
STDLIBS=-luser32
|
||||
endif
|
||||
endif
|
||||
|
@ -1,5 +1,13 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
ifeq ($(TERM),msys)
|
||||
MSYS=true
|
||||
else
|
||||
ifeq ($(OSTYPE),msys)
|
||||
MSYS=true
|
||||
endif
|
||||
endif
|
||||
|
||||
TOP=..
|
||||
SHORTTARGET=rddt
|
||||
TARGET=rddt
|
||||
@ -10,7 +18,7 @@ else
|
||||
ifeq ($(TERM),cygwin)
|
||||
STDLIBS=-luser32
|
||||
else
|
||||
ifeq ($(TERM),msys)
|
||||
ifdef MSYS
|
||||
STDLIBS=-luser32
|
||||
endif
|
||||
endif
|
||||
|
Reference in New Issue
Block a user