admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xbox1/360: remove cygpath requirement to allow older mingw toolchains to work

Browse Source
This commit is contained in:
Brad Parker
2017-09-17 11:25:30 -04:00
parent 50a9a34e6b
commit d9903ad05b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.libretro
View File

@@ -11,6 +11,8 @@ BACKSLASH :=
BACKSLASH := \$(BACKSLASH) BACKSLASH := \$(BACKSLASH)
filter_out1 = $(filter-out $(firstword $1),$1) filter_out1 = $(filter-out $(firstword $1),$1)
filter_out2 = $(call filter_out1,$(call filter_out1,$1)) filter_out2 = $(call filter_out1,$(call filter_out1,$1))
unixpath = $(subst \,/,$1)
unixcygpath = $(subst C:,/c,$(subst c:,/c,$(call unixpath,$1)))
ifeq ($(platform),) ifeq ($(platform),)
platform = unix platform = unix
@@ -423,13 +425,13 @@ LDFLAGS += -DLL
# Windows MSVC 2003 Xbox 1 # Windows MSVC 2003 Xbox 1
else ifeq ($(platform), xbox1_msvc2003) else ifeq ($(platform), xbox1_msvc2003)
TARGET := $(TARGET_NAME)_libretro_xdk1.lib TARGET := $(TARGET_NAME)_libretro_xdk1.lib
CC = "CL.exe" CC = CL.exe
CXX = "CL.exe" CXX = CL.exe
LD = "lib.exe" LD = lib.exe
export INCLUDE := $(XDK)/xbox/include export INCLUDE := $(XDK)\xbox\include
export LIB := $(XDK)/xbox/lib export LIB := $(XDK)\xbox\lib
PATH := $(shell IFS=$$'\n'; cygpath -w "$(XDK)/xbox/bin/vc71"):$(PATH) PATH := $(call unixcygpath,$(XDK)/xbox/bin/vc71):$(PATH)
PSS_STYLE :=2 PSS_STYLE :=2
CFLAGS += -D_XBOX -D_XBOX1 CFLAGS += -D_XBOX -D_XBOX1
@@ -439,13 +441,13 @@ STATIC_LINKING=1
# Windows MSVC 2010 Xbox 360 # Windows MSVC 2010 Xbox 360
else ifeq ($(platform), xbox360_msvc2010) else ifeq ($(platform), xbox360_msvc2010)
TARGET := $(TARGET_NAME)_libretro_xdk360.lib TARGET := $(TARGET_NAME)_libretro_xdk360.lib
CC = "cl.exe" CC = cl.exe
CXX = "cl.exe" CXX = cl.exe
LD = "lib.exe" LD = lib.exe
export INCLUDE := $(XEDK)/include/xbox export INCLUDE := $(XEDK)/include/xbox
export LIB := $(XEDK)/lib/xbox export LIB := $(XEDK)/lib/xbox
PATH := $(shell IFS=$$'\n'; cygpath -w "$(XEDK)/bin/win32"):$(PATH) PATH := $(call unixcygpath,$(XEDK)/bin/win32):$(PATH)
PSS_STYLE :=2 PSS_STYLE :=2
CFLAGS += -D_XBOX -D_XBOX360 CFLAGS += -D_XBOX -D_XBOX360