Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 21:29:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Improve MSYS2 support: MinGW-W64 detection

Browse Source
This commit is contained in:
Anton Kochkov 2015-07-11 02:19:20 +03:00
parent ab7c399b38
commit 2ba692a373
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/config.mk.tail
View File

@ -115,7 +115,7 @@ EXT_SO=dll
EXT_EXE=.exe
TH_LIBS=
endif
ifneq (,$(findstring mingw32,${OSTYPE})$(findstring msys,${OSTYPE}))
ifneq (,$(findstring mingw32,${OSTYPE})$(findstring mingw64,${OSTYPE})$(findstring msys,${OSTYPE}))
CFLAGS+=-DMINGW32=1
EXT_AR=lib
EXT_SO=dll

4
mk/gcc.mk
View File

@ -24,6 +24,9 @@ else
ifneq (,$(findstring mingw32,${OSTYPE}))
PIC_CFLAGS=
else
ifneq (,$(findstring mingw64,${OSTYPE}))
PIC_CFLAGS=
else
ifneq (,$(findstring msys,${OSTYPE}))
PIC_CFLAGS=
else
@ -31,6 +34,7 @@ PIC_CFLAGS=-fPIC
endif
endif
endif
endif
ifeq ($(OSTYPE),darwin)
ARCH=$(shell uname -m)
#CFLAGS+=-arch ${ARCH}

2
shlr/Makefile
View File

@ -28,7 +28,7 @@ SDB_URL=git://github.com/radare/sdb
PWD=$(shell pwd)
SDB_CONFIG=${PWD}/sdb-config.mk
ifneq (,$(findstring cygwin,${OSTYPE})$(findstring mingw32,${OSTYPE})$(findstring msys,${OSTYPE}))
ifneq (,$(findstring cygwin,${OSTYPE})$(findstring mingw32,${OSTYPE})$(findstring mingw64,${OSTYPE})$(findstring msys,${OSTYPE}))
CFLAGS_SHARED=
else
CFLAGS_SHARED=-fPIC

2
shlr/zip/zip/Makefile
View File

@ -9,7 +9,7 @@ SOVER=${EXT_SO}
LDFLAGS+=-shared
LDFLAGS_SHARED?=-shared
else
ifneq (,$(findstring ming32,${OSTYPE})$(findstring msys,${OSTYPE}))
ifneq (,$(findstring ming32,${OSTYPE})$(findstring mingw64,${OSTYPE})$(findstring msys,${OSTYPE}))
CFLAGS+=-DMINGW32=1
EXT_SO=dll
SOVER=${EXT_SO}