mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-30 08:44:19 -04:00
*** empty log message ***
This commit is contained in:
parent
dfcc49d732
commit
3b79e79a9d
@ -32,8 +32,7 @@ ifneq (,$(NSPR_LIB))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (WIN32_VC,$(PENV_COMPILER))
|
ifeq (WIN32_VC,$(PENV_COMPILER))
|
||||||
lt := $(foreach path,$(LPATH_DIRS),$(shell cygpath -w $(path)))
|
LPATH := $(foreach path,$(LPATH_DIRS),-LIBPATH:"$(shell cygpath -w $(path))")
|
||||||
LPATH := $(patsubst %,-LIBPATH:"%",$(lt))
|
|
||||||
else # NON-WIN32_VC
|
else # NON-WIN32_VC
|
||||||
LPATH := $(patsubst %,-L%,$(LPATH_DIRS))
|
LPATH := $(patsubst %,-L%,$(LPATH_DIRS))
|
||||||
endif # WIN32_VC
|
endif # WIN32_VC
|
||||||
|
@ -92,11 +92,11 @@ IPATH_DIRS += $(DTOOL)
|
|||||||
|
|
||||||
# Convert CT_INCLUDE_PATH to cc/CC compatible flag string
|
# Convert CT_INCLUDE_PATH to cc/CC compatible flag string
|
||||||
ifeq (WIN32_VC,$(PENV_COMPILER))
|
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)"
|
SYS_IPATH := -I"$(shell cygpath -w /msvc98/Include)"
|
||||||
endif
|
else
|
||||||
|
|
||||||
IPATH := $(patsubst %,-I"%",$(IPATH_DIRS))
|
IPATH := $(patsubst %,-I"%",$(IPATH_DIRS))
|
||||||
|
endif
|
||||||
|
|
||||||
##### Playstation2 can't handle .so's. The rename to .a's is handled here
|
##### Playstation2 can't handle .so's. The rename to .a's is handled here
|
||||||
##### and acted upon in Makefile.so.rules. (CSN)
|
##### and acted upon in Makefile.so.rules. (CSN)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user