folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile: Tolerate changing MinGW include file changes

Browse source 
Fix #487
This commit is contained in:
Mark Pizzolato 2017-11-11 10:52:29 -08:00
parent a8010f6fdb
commit b45b9426c6
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
makefile
View file

@ -913,6 +913,9 @@ else
NETWORK_LAN_FEATURES += NAT(SLiRP) NETWORK_LAN_FEATURES += NAT(SLiRP)
endif endif
endif endif
ifneq (,$(call find_include,ddk/ntdddisk))
CFLAGS_I = -DHAVE_NTDDDISK_H
endif
endif # Win32 (via MinGW) endif # Win32 (via MinGW)
ifneq (,$(GIT_COMMIT_ID)) ifneq (,$(GIT_COMMIT_ID))
CFLAGS_GIT = -DSIM_GIT_COMMIT_ID=$(GIT_COMMIT_ID) CFLAGS_GIT = -DSIM_GIT_COMMIT_ID=$(GIT_COMMIT_ID)
@ -1013,7 +1016,7 @@ ifneq ($(DONT_USE_READER_THREAD),)
endif endif
CC_OUTSPEC = -o $@ CC_OUTSPEC = -o $@
CC := $(GCC) $(CC_STD) -U__STRICT_ANSI__ $(CFLAGS_G) $(CFLAGS_O) $(CFLAGS_GIT) -DSIM_COMPILER="$(COMPILER_NAME)" -I . $(OS_CCDEFS) $(ROMS_OPT) CC := $(GCC) $(CC_STD) -U__STRICT_ANSI__ $(CFLAGS_G) $(CFLAGS_O) $(CFLAGS_GIT) $(CFLAGS_I) -DSIM_COMPILER="$(COMPILER_NAME)" -I . $(OS_CCDEFS) $(ROMS_OPT)
LDFLAGS := $(OS_LDFLAGS) $(NETWORK_LDFLAGS) $(LDFLAGS_O) LDFLAGS := $(OS_LDFLAGS) $(NETWORK_LDFLAGS) $(LDFLAGS_O)
# #

2
sim_disk.c
View file

@ -2143,7 +2143,7 @@ if ((dwStatus >= ERROR_INVALID_STARTING_CODESEG) && (dwStatus <= ERROR_INFLOOP_I
} }
errno = EINVAL; errno = EINVAL;
} }
#if defined(__GNUC__) #if defined(__GNUC__) && defined(HAVE_NTDDDISK_H)
#include <ddk/ntddstor.h> #include <ddk/ntddstor.h>
#include <ddk/ntdddisk.h> #include <ddk/ntdddisk.h>
#else #else