diff --git a/Makefile b/Makefile index df37fbe642..581956a411 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/28] +# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/25] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware @@ -205,6 +205,7 @@ LCL_PLATFORM=gtk endif export LCL_PLATFORM endif +export RCPP?=$(strip $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))) override TARGET_DIRS+=lcl components override TARGET_PROGRAMS+=lazarus override TARGET_EXAMPLEDIRS+=examples @@ -1635,7 +1636,7 @@ endif .PHONY: lcl components ide tools all clean .SUFFIXES: .rc .res %.res: %.rc - windres -i $< -o $@ --preprocessor $(strip $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))) + windres -i $< -o $@ --preprocessor $(RCPP) ide: ifeq ($(OS_TARGET), win32) $(MAKE) lazarus.res diff --git a/Makefile.fpc b/Makefile.fpc index d76436796e..5fd7f97caf 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -39,12 +39,15 @@ endif export LCL_PLATFORM endif +export RCPP?=$(strip $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))) + [rules] .PHONY: lcl components ide tools all clean .SUFFIXES: .rc .res %.res: %.rc - windres -i $< -o $@ --preprocessor $(strip $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))) + windres -i $< -o $@ --preprocessor $(RCPP) +# $(strip $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))) ide: ifeq ($(OS_TARGET), win32)