One more rework for support MinGW

This commit is contained in:
Alexander S. Aganichev 2004-01-20 15:00:03 +00:00
parent 86705f4181
commit 142b2807d0
5 changed files with 22 additions and 50 deletions

View File

@ -1,10 +1,10 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys) ifeq ($(TERM),cygwin)
MSYS=true MINGW=true
else else
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)
MSYS=true MINGW=true
endif endif
endif endif
@ -40,7 +40,7 @@ EXEEXT=.exe
OBJEXT=.o OBJEXT=.o
LIBEXT=.a LIBEXT=.a
else else
ifeq ($(TERM),cygwin) ifdef MINGW
CAT=cat CAT=cat
CC=gcc -mno-cygwin CC=gcc -mno-cygwin
CXX=g++ -mno-cygwin CXX=g++ -mno-cygwin
@ -48,19 +48,9 @@ AR=ar
RANLIB=ranlib RANLIB=ranlib
WINDRES=windres WINDRES=windres
PLATFORM=cyg PLATFORM=cyg
ifeq ($(OSTYPE),msys)
SHELL=bash SHELL=bash
EXEEXT=.exe endif
OBJEXT=.o
LIBEXT=.a
else
ifdef MSYS
CAT=cat
CC=gcc
CXX=g++
AR=ar
RANLIB=ranlib
WINDRES=windres
PLATFORM=cyg
EXEEXT=.exe EXEEXT=.exe
OBJEXT=.o OBJEXT=.o
LIBEXT=.a LIBEXT=.a
@ -90,7 +80,6 @@ endif
endif endif
endif endif
endif endif
endif
CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer
LNKFLAGS+=-g LNKFLAGS+=-g
CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti

View File

@ -1,10 +1,10 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys) ifeq ($(TERM),cygwin)
MSYS=true MINGW=true
else else
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)
MSYS=true MINGW=true
endif endif
endif endif
@ -18,14 +18,9 @@ ifeq ($(findstring EMX, $(PATH)), EMX)
STDLIBS=-los2me -lstdcpp STDLIBS=-los2me -lstdcpp
GLIBS+=glibc GLIBS+=glibc
else else
ifeq ($(TERM),cygwin) ifdef MINGW
STDLIBS=-luser32 -lwinmm STDLIBS=-luser32 -lwinmm
GLIBS+=glibc GLIBS+=glibc
else
ifdef MSYS
STDLIBS=-luser32 -lwinmm
GLIBS+=glibc
endif
endif endif
endif endif

View File

@ -1,10 +1,10 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys) ifeq ($(TERM),cygwin)
MSYS=true MINGW=true
else else
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)
MSYS=true MINGW=true
endif endif
endif endif
@ -14,12 +14,8 @@ INCS=-I$(TOP)/goldlib/gall
ifeq ($(findstring EMX, $(PATH)), EMX) ifeq ($(findstring EMX, $(PATH)), EMX)
INCS+=-I$(TOP)/goldlib/glibc INCS+=-I$(TOP)/goldlib/glibc
else else
ifeq ($(TERM),cygwin) ifdef MINGW
INCS+=-I$(TOP)/goldlib/glibc INCS+=-I$(TOP)/goldlib/glibc
else
ifdef MSYS
INCS+=-I$(TOP)/goldlib/glibc
endif
endif endif
endif endif

View File

@ -1,10 +1,10 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys) ifeq ($(TERM),cygwin)
MSYS=true MINGW=true
else else
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)
MSYS=true MINGW=true
endif endif
endif endif
@ -15,12 +15,8 @@ INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/golded3/
ifeq ($(findstring EMX, $(PATH)), EMX) ifeq ($(findstring EMX, $(PATH)), EMX)
STDLIBS=-lstdcpp STDLIBS=-lstdcpp
else else
ifeq ($(TERM),cygwin) ifdef MINGW
STDLIBS=-luser32 STDLIBS=-luser32
else
ifdef MSYS
STDLIBS=-luser32
endif
endif endif
endif endif
GLIBS=gall GLIBS=gall

View File

@ -1,10 +1,10 @@
# -*- makefile -*- # -*- makefile -*-
ifeq ($(TERM),msys) ifeq ($(TERM),cygwin)
MSYS=true MINGW=true
else else
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)
MSYS=true MINGW=true
endif endif
endif endif
@ -15,12 +15,8 @@ INCS=-I$(TOP)/goldlib/gall
ifeq ($(findstring EMX, $(PATH)), EMX) ifeq ($(findstring EMX, $(PATH)), EMX)
STDLIBS=-lstdcpp STDLIBS=-lstdcpp
else else
ifeq ($(TERM),cygwin) ifdef MINGW
STDLIBS=-luser32 STDLIBS=-luser32
else
ifdef MSYS
STDLIBS=-luser32
endif
endif endif
endif endif
GLIBS=gall GLIBS=gall