Commit 08279e21 authored by Moises Cardona's avatar Moises Cardona Committed by Christian R. Helmrich
Browse files

Some changes to allow compilation on MinGW on Windows

parent 0ac59ebd
......@@ -26,6 +26,9 @@
#include <time.h>
#if defined (_WIN32) || defined (WIN32) || defined (_WIN64) || defined (WIN64)
#include <windows.h>
#ifdef __MINGW32__
#include <share.h>
#endif
#define EXHALE_TEXT_BLUE (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_GREEN)
#define EXHALE_TEXT_PINK (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_RED)
......
......@@ -39,7 +39,7 @@
#ifndef __min
# define __min(a, b) ((a) < (b) ? (a) : (b))
#endif
#ifndef fprintf_s
#if !defined (fprintf_s) && !defined (__MINGW32__)
# define fprintf_s fprintf
#endif
......
......@@ -42,7 +42,7 @@ RELEASE_OBJS = $(OBJS:.o=.r.o)
## specification of compiler flags
CPPFLAGS = -fPIC $(DEFS) -I$(CURDIR)/$(DIR_INC) -Wall -Werror -Wshadow -D_FILE_OFFSET_BITS=64 -std=c++11
CPPFLAGS = -fPIC $(DEFS) -I$(CURDIR)/$(DIR_INC) -Wall -Werror -Wshadow -D_FILE_OFFSET_BITS=64 -std=c++11 $(CXXFLAGS)
# setting of 32-bit compiler flags
MM32?=0
......@@ -56,7 +56,7 @@ RELEASE_CPPFLAGS = -O3 -Wuninitialized
## specification of linker flags
ALL_LDFLAGS = -Wall
ALL_LDFLAGS = -Wall $(ADDITIONAL_LDFLAGS)
# setting of 32-bit linker flags
ifeq ($(MM32), 1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment