Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MSYS2 support #912

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add MSYS2 support #912

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2844680
Update Makefile
taozuhong Sep 27, 2020
d2c9f17
Merge pull request #1 from redis/master
taozuhong Jan 9, 2021
de6f970
add MSYS2 support
Jan 9, 2021
a6a7e6d
back to origin setting
Jan 9, 2021
34ebd62
MSYS2 32 and 64 bit support
Jan 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file is released under the BSD license, see the COPYING file

OBJ=alloc.o net.o hiredis.o sds.o async.o read.o sockcompat.o
SSL_OBJ=ssl.o
SSL_OBJ=alloc.o net.o hiredis.o sds.o async.o read.o sockcompat.o ssl.o
EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib hiredis-example-push
ifeq ($(USE_SSL),1)
EXAMPLES+=hiredis-example-ssl hiredis-example-libevent-ssl
Expand Down Expand Up @@ -50,8 +50,8 @@ DEBUG_FLAGS?= -g -ggdb
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
REAL_LDFLAGS=$(LDFLAGS)

DYLIBSUFFIX=so
STLIBSUFFIX=a
DYLIBSUFFIX=$(if $(WINDIR),dll,so)
STLIBSUFFIX=$(if $(WINDIR),lib,a)
DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
Expand Down Expand Up @@ -84,6 +84,13 @@ else
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
endif

ifeq ($(findstring MINGW,$(uname_S)),MINGW)
OPENSSL_PREFIX?=$(MINGW_PREFIX)
CFLAGS+=-I$(OPENSSL_PREFIX)/include/openssl
REAL_LDFLAGS+= -lwsock32 -lws2_32
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto -lcrypt32
endif

ifeq ($(uname_S),SunOS)
IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
ifeq ($(IS_SUN_CC),1)
Expand Down