tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-31 01:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix batch-file launching dir, remove info

Browse Source
This commit is contained in:
xomx 2025-02-21 15:45:48 +01:00
parent 679cc48ff7
commit a1eb96db16
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PowerEditor/gcc/makefile
View File

@ -184,9 +184,9 @@ ifeq "$(WIN_DIR)" ""
MKDIR := mkdir -p MKDIR := mkdir -p
CPDIR := cp -r CPDIR := cp -r
RMDIR := rm -rf RMDIR := rm -rf
DIR := ls -l
CP := cp CP := cp
RM := rm -f RM := rm -f
CD-PREBUILD := PowerEditor/src
normalize-path = $1 normalize-path = $1
else ifneq "$(wildcard $(dir $(SHELL))ls.exe)" "" else ifneq "$(wildcard $(dir $(SHELL))ls.exe)" ""
# a Windows system with a proper shell # a Windows system with a proper shell
@ -196,18 +196,18 @@ SHELL_DIRECTORY := $(subst |,$(SPACE),$(dir $(subst $(SPACE),|,$(SHELL))))
MKDIR := $(SHELL_DIRECTORY)mkdir.exe -p MKDIR := $(SHELL_DIRECTORY)mkdir.exe -p
CPDIR := $(SHELL_DIRECTORY)cp.exe -r CPDIR := $(SHELL_DIRECTORY)cp.exe -r
RMDIR := $(SHELL_DIRECTORY)rm.exe -rf RMDIR := $(SHELL_DIRECTORY)rm.exe -rf
DIR := $(SHELL_DIRECTORY)ls -l
CP := $(SHELL_DIRECTORY)cp.exe CP := $(SHELL_DIRECTORY)cp.exe
RM := $(SHELL_DIRECTORY)rm.exe -f RM := $(SHELL_DIRECTORY)rm.exe -f
CD-PREBUILD := PowerEditor/src
normalize-path = $1 normalize-path = $1
else else
# a standard Windows system # a standard Windows system
MKDIR := mkdir MKDIR := mkdir
CPDIR := xcopy /q /e /i /y CPDIR := xcopy /q /e /i /y
RMDIR := rmdir /q /s RMDIR := rmdir /q /s
DIR := dir
CP := copy /y CP := copy /y
RM := del /q RM := del /q
CD-PREBUILD := ../src
normalize-path = $(subst /,\,$1) normalize-path = $(subst /,\,$1)
endif endif
@ -240,8 +240,7 @@ all: pre-build-event $(SCINTILLA_TARGET) $(LEXILLA_TARGET)
pre-build-event: pre-build-event:
@echo Executing pre-build events... @echo Executing pre-build events...
@$(DIR) @cd $(CD-PREBUILD) && $(PREBUILD_EVENT_CMD)
$(AT)$(call normalize-path,$(SRC_DIRECTORY)/$(PREBUILD_EVENT_CMD))
$(BUILD_DIRECTORY): $(BUILD_DIRECTORY):
@echo + creating BUILD_DIRECTORY $@ @echo + creating BUILD_DIRECTORY $@