diff options
| author | Arthur Schreiber <schreiber.arthur@gmail.com> | 2013-07-31 19:13:35 +0200 |
|---|---|---|
| committer | Arthur Schreiber <schreiber.arthur@gmail.com> | 2013-07-31 19:13:35 +0200 |
| commit | a6837b5fc9465e0f271ccd2c0bb71aae78a10a64 (patch) | |
| tree | 778580fae2123a0bbc3f5807724ce10476a166a9 /Makefile.embed | |
| parent | 847c679309378748d2a3ac1c5a49331d2e64d4cf (diff) | |
| download | libgit2-a6837b5fc9465e0f271ccd2c0bb71aae78a10a64.tar.gz | |
When building with MINGW, specify `__USE_MINGW_ANSI_STDIO`.
This option is already present in the CMake config, but was missing from `Makefile.embed` and would cause all kinds of weird failures when compiling rugged on windows with the ruby devkit.
Diffstat (limited to 'Makefile.embed')
| -rw-r--r-- | Makefile.embed | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.embed b/Makefile.embed index 8b8970d76..2f3b057c7 100644 --- a/Makefile.embed +++ b/Makefile.embed @@ -6,12 +6,12 @@ else PREFIX= endif -WIN32=0 +MINGW=0 ifneq (,$(findstring MINGW32,$(PLATFORM))) - WIN32=1 + MINGW=1 endif ifneq (,$(findstring mingw,$(CROSS_COMPILE))) - WIN32=1 + MINGW=1 endif rm=rm -f @@ -20,7 +20,7 @@ RANLIB=$(PREFIX)ranlib LIBNAME=libgit2.a -ifeq ($(WIN32),1) +ifeq ($(MINGW),1) CC=gcc else CC=cc @@ -35,10 +35,10 @@ CFLAGS= -g $(DEFINES) -Wall -Wextra -O2 $(EXTRA_CFLAGS) SRCS = $(wildcard src/*.c) $(wildcard src/transports/*.c) $(wildcard src/xdiff/*.c) $(wildcard deps/http-parser/*.c) $(wildcard deps/zlib/*.c) src/hash/hash_generic.c -ifeq ($(WIN32),1) +ifeq ($(MINGW),1) SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c INCLUDES += -Ideps/regex - DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 + DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 -D__USE_MINGW_ANSI_STDIO=1 else SRCS += $(wildcard src/unix/*.c) CFLAGS += -fPIC |