| From 4591a15982077c8a1d4c9505aeb1025722129562 Mon Sep 17 00:00:00 2001 |
| From: David Macek <david.macek.0@gmail.com> |
| Date: Thu, 12 Feb 2015 12:57:31 +0100 |
| Subject: [PATCH 1/3] Use POSIX tools in makefiles |
| |
| --- |
| scintilla/gtk/makefile | 2 +- |
| scite/win32/makefile | 24 +++--------------------- |
| 2 files changed, 4 insertions(+), 22 deletions(-) |
| |
| diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile |
| index cdf1aa1..0d4397e 100644 |
| --- a/scintilla/gtk/makefile |
| +++ b/scintilla/gtk/makefile |
| @@ -61,7 +61,7 @@ endif |
| |
| ifdef windir |
| CC = gcc |
| -DEL = del /q |
| +DEL = rm -f |
| LEXILLA = lexilla.dll |
| else |
| DEL = rm -f |
| diff --git a/scite/win32/makefile b/scite/win32/makefile |
| index daffb70..e5ccb62 100644 |
| --- a/scite/win32/makefile |
| +++ b/scite/win32/makefile |
| @@ -43,23 +43,9 @@ WINDRES ?= windres |
| ifndef CLANG |
| CC = gcc |
| endif |
| - DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del) |
| - COPY = $(if $(wildcard $(dir $(SHELL))cp.exe), $(dir $(SHELL))cp.exe -a, xcopy /Y) |
| - VER = cmd /c ver |
| - # Discover Windows version by running 'VER' command and parsing output |
| - # For Windows 2000 looks like:Microsoft Windows 2000 [Version 5.00.2195] |
| - WINVERWORDS:=$(wordlist 1,2,$(subst ., ,$(lastword $(shell $(VER))))) |
| - WINVER:=$(firstword $(WINVERWORDS)).$(lastword $(WINVERWORDS)) |
| - # Windows NT 4 and Windows 2000 do not support themes so turn off |
| -ifeq '$(WINVER)' '4.0' |
| - DEFINES += -DDISABLE_THEMES -DWIN_TARGET=0x0400 |
| -else |
| -ifeq '$(WINVER)' '5.00' |
| - DEFINES += -DDISABLE_THEMES |
| -else |
| + DEL = rm -f |
| + COPY = cp -a |
| LIBS += -luxtheme |
| -endif |
| -endif |
| else |
| DEL = rm -f |
| COPY = cp -a |
| -- |
| 2.3.0 |
| |
