summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Dirk Best <mail@dirk-best.de>2014-10-23 10:32:21 +0200
committer Dirk Best <mail@dirk-best.de>2014-10-23 10:32:38 +0200
commit2d5eacd0f55ef9546daf5d76df7c3e0c0fabbf01 (patch)
tree6b363744d068379646bdaa17858ed12b3aaa6cdd
parent4b0e2a830e4cf761653203ab5cf4801237f9e2e6 (diff)
Allow compilation on cygwin based terminals on Windows (like cmder)
-rw-r--r--src/build/build.mak16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/build/build.mak b/src/build/build.mak
index c38872eb7a9..e2937b32a90 100644
--- a/src/build/build.mak
+++ b/src/build/build.mak
@@ -25,6 +25,14 @@ MAKELIST_TARGET = $(BUILDOUT)/makelist$(BUILD_EXE)
PNG2BDC_TARGET = $(BUILDOUT)/png2bdc$(BUILD_EXE)
VERINFO_TARGET = $(BUILDOUT)/verinfo$(BUILD_EXE)
+FILE2STR = $(FILE2STR_TARGET)
+MAKEDEP = $(MAKEDEP_TARGET)
+MAKEMAK = $(MAKEMAK_TARGET)
+MAKELIST = $(MAKELIST_TARGET)
+PNG2BDC = $(PNG2BDC_TARGET)
+VERINFO = $(VERINFO_TARGET)
+
+ifneq ($(TERM),cygwin)
ifeq ($(TARGETOS),win32)
FILE2STR = $(subst /,\,$(FILE2STR_TARGET))
MAKEDEP = $(subst /,\,$(MAKEDEP_TARGET))
@@ -32,13 +40,7 @@ MAKEMAK = $(subst /,\,$(MAKEMAK_TARGET))
MAKELIST = $(subst /,\,$(MAKELIST_TARGET))
PNG2BDC = $(subst /,\,$(PNG2BDC_TARGET))
VERINFO = $(subst /,\,$(VERINFO_TARGET))
-else
-FILE2STR = $(FILE2STR_TARGET)
-MAKEDEP = $(MAKEDEP_TARGET)
-MAKEMAK = $(MAKEMAK_TARGET)
-MAKELIST = $(MAKELIST_TARGET)
-PNG2BDC = $(PNG2BDC_TARGET)
-VERINFO = $(VERINFO_TARGET)
+endif
endif
ifneq ($(CROSS_BUILD),1)