ecere/gfx/drivers/OpenGL; 3DS: Fixed GLES indices, matrix stack issues

[sdk] / crossplatform.mk

diff --git a/crossplatform.mk b/crossplatform.mk
index 284c890..0e507a8 100644 (file)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -195,13 +195,14 @@ else
 endif
 
 # PREFIXES AND EXTENSIONS
-.SUFFIXES: .c .ec .sym .imp .bowl .o .a
 EC := .ec
 S := .sym
 I := .imp
 B := .bowl
 C := .c
+ifndef O
 O := .o
+endif
 A := .a
 E := $(if $(WINDOWS_TARGET),.exe,)
 SO := $(if $(WINDOWS_TARGET),.dll,$(if $(OSX_TARGET),.dylib,.so))
@@ -209,6 +210,7 @@ LP := $(if $(WINDOWS_TARGET),$(if $(STATIC_LIBRARY_TARGET),lib,),lib)
 HOST_E := $(if $(WINDOWS_HOST),.exe,)
 HOST_SO := $(if $(WINDOWS_HOST),.dll,$(if $(OSX_HOST),.dylib,.so))
 HOST_LP := $(if $(WINDOWS_HOST),$(if $(STATIC_LIBRARY_TARGET),lib,),lib)
+.SUFFIXES: .c .ec .sym .imp .bowl $(O) $(A)
 
 # TARGET VERSION
 VER := $(if $(LINUX_TARGET),$(if $(LINUX_HOST),$(if $(VERSION),.$(VERSION),),),)
@@ -240,6 +242,7 @@ ifdef WIN_SHELL_COMMANDS
    echo = $(if $(1),echo $(1))
    touch = $(if $(1),@cmd /c "for %%I in ($(call sys_path,$(1))) do @(cd %%~pI && type nul >> %%~nxI && copy /by %%~nxI+,, > nul 2>&1 && cd %%cd%%)")
    cpq = $(if $(1),@cmd /c "for %%I in ($(call sys_path,$(1))) do copy /by %%I $(call sys_path,$(2))" > nul 2>&1)
+   cpv = $(if $(1),@cmd /c "for %%I in ($(call sys_path,$(1))) do copy /by %%I $(call sys_path,$(2))")
    rmq = $(if $(1),-del /f /q $(call sys_path,$(call sys_path_list,$(1))) > nul 2>&1)
    rmrq = $(if $(1),-rmdir /q /s $(call sys_path,$(1)) > nul 2>&1)
    mkdirq = $(if $(1),-mkdir $(call sys_path,$(1)) > nul 2>&1)
@@ -249,6 +252,7 @@ else
    echo = $(if $(1),echo "$(1)")
    touch = $(if $(1),touch $(1))
    cpq = $(if $(1),cp $(1) $(2))
+   cpv = cp $(1) $(2)
    rmq = $(if $(1),-rm -f $(1))
    rmrq = $(if $(1),-rm -f -r $(1))
    mkdirq = $(if $(1),-mkdir -p $(1))
@@ -292,7 +296,7 @@ ifndef REPOSITORY_VER
       else
          ifneq ($(shell $(GIT) log -n 1 --format="%%%%" $(nullerror)),)
             export GIT_REPOSITORY := yes
-            export REPOSITORY_VER := $(shell $(GIT) describe --tags --dirty="\ (dirty)" --always)
+            export REPOSITORY_VER := $(shell $(GIT) describe --tags --dirty=" (dirty)" --always)
          endif
       endif
    endif