From 3b79e79a9d72cabcbda03e88c1508ea605c0fd17 Mon Sep 17 00:00:00 2001 From: Mark Mine Date: Wed, 11 Oct 2000 02:13:55 +0000 Subject: [PATCH] *** empty log message *** --- dtool/src/build/Makefile.bin.vars | 3 +-- dtool/src/build/Makefile.o.vars | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dtool/src/build/Makefile.bin.vars b/dtool/src/build/Makefile.bin.vars index 7d97d50dc5..28214f40fd 100644 --- a/dtool/src/build/Makefile.bin.vars +++ b/dtool/src/build/Makefile.bin.vars @@ -32,8 +32,7 @@ ifneq (,$(NSPR_LIB)) endif ifeq (WIN32_VC,$(PENV_COMPILER)) - lt := $(foreach path,$(LPATH_DIRS),$(shell cygpath -w $(path))) - LPATH := $(patsubst %,-LIBPATH:"%",$(lt)) + LPATH := $(foreach path,$(LPATH_DIRS),-LIBPATH:"$(shell cygpath -w $(path))") else # NON-WIN32_VC LPATH := $(patsubst %,-L%,$(LPATH_DIRS)) endif # WIN32_VC diff --git a/dtool/src/build/Makefile.o.vars b/dtool/src/build/Makefile.o.vars index 3975b93133..d9f4741827 100644 --- a/dtool/src/build/Makefile.o.vars +++ b/dtool/src/build/Makefile.o.vars @@ -92,12 +92,12 @@ IPATH_DIRS += $(DTOOL) # Convert CT_INCLUDE_PATH to cc/CC compatible flag string ifeq (WIN32_VC,$(PENV_COMPILER)) - IPATH_DIRS := $(foreach path,$(IPATH_DIRS),$(shell cygpath -w $(path))) + IPATH := $(foreach path,$(IPATH_DIRS),-I"$(shell cygpath -w $(path))") SYS_IPATH := -I"$(shell cygpath -w /msvc98/Include)" +else + IPATH := $(patsubst %,-I"%",$(IPATH_DIRS)) endif -IPATH := $(patsubst %,-I"%",$(IPATH_DIRS)) - ##### Playstation2 can't handle .so's. The rename to .a's is handled here ##### and acted upon in Makefile.so.rules. (CSN)