fixes for Linux build (part of ticket 4700)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/palmos/makefile-engine.mk b/build/palmos/makefile-engine.mk
index 1fe602a3897193cb933cf78b475dd2bdc15d23c2..3477b50484d9ed722a5df0d7ab0ebede5674f55b 100644 (file)
--- a/build/palmos/makefile-engine.mk
+++ b/build/palmos/makefile-engine.mk
@@ -173,6 +173,7 @@ endif
 UNAME :=$(shell uname)
 ifeq ($(UNAME),Linux)
 # Linux Settings
 UNAME :=$(shell uname)
 ifeq ($(UNAME),Linux)
 # Linux Settings

+PELF2BIN:=wine "$(TOOLS_DIR)/pelf2bin.exe"

 PSLIB:=wine "$(TOOLS_DIR)/pslib.exe"
 PRCMERGE :=wine "$(TOOLS_DIR)/PRCMerge.exe"
 PALMRC :=wine "$(TOOLS_DIR)/PalmRc.exe"
 PSLIB:=wine "$(TOOLS_DIR)/pslib.exe"
 PRCMERGE :=wine "$(TOOLS_DIR)/PRCMerge.exe"
 PALMRC :=wine "$(TOOLS_DIR)/PalmRc.exe"


@@ -617,9 +618,9 @@ $(SIM_OBJ_DIR)/%.o : %.CPP #makefile
 
 # XRD source processing
 $(RSC_OBJ_DIR)/%.trc : %.xrd makefile
 
 # XRD source processing
 $(RSC_OBJ_DIR)/%.trc : %.xrd makefile

-       $(PALMRC) -p $(TARGET_FORMAT) -makeDeps $(@D)/$(*F).deps $(RFLAGS) -locale $(LOCALE) "`cygpath -w -a ./$<`" -o $@
+       $(PALMRC) -p $(TARGET_FORMAT) -makeDeps $(@D)/$(*F).deps $(RFLAGS) -locale $(LOCALE) "`$(CYGPATH_WA) ./$<`" -o $@

 $(RSC_OBJ_DIR)/%.trc : %.XRD makefile
 $(RSC_OBJ_DIR)/%.trc : %.XRD makefile

-       $(PALMRC) -p $(TARGET_FORMAT) -makeDeps $(@D)/$(*F).deps $(RFLAGS) -locale $(LOCALE) "`cygpath -w -a ./$<`" -o $@
+       $(PALMRC) -p $(TARGET_FORMAT) -makeDeps $(@D)/$(*F).deps $(RFLAGS) -locale $(LOCALE) "`$(CYGPATH_WA) ./$<`" -o $@

 
 
 # Definition file source processing
 
 
 # Definition file source processing