sdk: Fixes to include.mk to allow building from MSYS (Thanks Naji!)

diff --git a/include.mk b/include.mk
index 3626921..4cd63d7 100644 (file)
--- a/include.mk
+++ b/include.mk
@@ -34,6 +34,7 @@ fixspace = $(subst $(space),\$(space),$1)
 hidspace = $(subst $(space),^,$1)
 shwspace = $(subst ^,$(space),$1)
 ifdef WINDOWS
+ifndef MSYSCON
    fixps = $(subst \,/,$(1))
    psep = $(subst \\,/,$(subst /,\,$(1)))
    PS := $(strip \)
@@ -42,6 +43,12 @@ else
    fixps = $(1)
    PS := $(strip /)
    psep = $(1)
+   SODESTDIR := obj/$(PLATFORM)/bin/
+endif
+else
+   fixps = $(1)
+   PS := $(strip /)
+   psep = $(1)
    SODESTDIR := obj/$(PLATFORM)/lib/
 endif
 
@@ -100,6 +107,7 @@ UPX := upx
 
 # SHELL COMMANDS
 ifdef WINDOWS
+ifndef MSYSCON
    echo = $(if $(1),echo $(1))
    cpq = $(if $(1),@cmd /c for %%I in ($(call psep,$(1))) do @copy /y %%I $(call psep,$(2)) > nul 2>&1)
    rmq = $(if $(1),-@del /f /q $(call psep,$(1)) > nul 2>&1)
@@ -107,6 +115,14 @@ ifdef WINDOWS
    mkdirq = $(if $(1),-@mkdir $(call psep,$(1)) > nul 2>&1)
    rmdirq = $(if $(1),-@rmdir /q $(call psep,$(1)) > nul 2>&1)
 else
+   echo = $(if $(1),echo "$(1)")
+   cpq = $(if $(1),@cp $(1) $(2))
+   rmq = $(if $(1),-@rm -f $(1))
+   rmrq = $(if $(1),-@rm -f -r $(1))
+   mkdirq = $(if $(1),-@mkdir -p $(1))
+   rmdirq = $(if $(1),-@rmdir $(1))
+endif
+else
 ifdef OSX
    echo = $(if $(1),echo "$(1)")
    cpq = $(if $(1),cp $(1) $(2))