fenix/exhale
1
0
Fork 0
mirror of https://gitlab.com/ecodis/exhale.git synced 2025-02-03 08:57:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some changes to allow compilation on MinGW on Windows

Browse Source
This commit is contained in:
Moises Cardona 2020-05-02 21:00:12 +00:00 committed by Christian R. Helmrich
parent 0ac59ebd84
commit 08279e2182
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/exhaleApp.cpp
View File

@ -26,6 +26,9 @@
#include <time.h> #include <time.h>
#if defined (_WIN32) || defined (WIN32) || defined (_WIN64) || defined (WIN64) #if defined (_WIN32) || defined (WIN32) || defined (_WIN64) || defined (WIN64)
#include <windows.h> #include <windows.h>
#ifdef __MINGW32__
#include <share.h>
#endif
#define EXHALE_TEXT_BLUE (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_GREEN) #define EXHALE_TEXT_BLUE (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_GREEN)
#define EXHALE_TEXT_PINK (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_RED) #define EXHALE_TEXT_PINK (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_RED)

2
src/app/exhaleAppPch.h
View File

@ -39,7 +39,7 @@
#ifndef __min #ifndef __min
# define __min(a, b) ((a) < (b) ? (a) : (b)) # define __min(a, b) ((a) < (b) ? (a) : (b))
#endif #endif
#ifndef fprintf_s #if !defined (fprintf_s) && !defined (__MINGW32__)
# define fprintf_s fprintf # define fprintf_s fprintf
#endif #endif

4
src/makefile.base
View File

@ -42,7 +42,7 @@ RELEASE_OBJS = $(OBJS:.o=.r.o)
## specification of compiler flags ## 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 # setting of 32-bit compiler flags
MM32?=0 MM32?=0
@ -56,7 +56,7 @@ RELEASE_CPPFLAGS = -O3 -Wuninitialized
## specification of linker flags ## specification of linker flags
ALL_LDFLAGS = -Wall ALL_LDFLAGS = -Wall $(ADDITIONAL_LDFLAGS)
# setting of 32-bit linker flags # setting of 32-bit linker flags
ifeq ($(MM32), 1) ifeq ($(MM32), 1)