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

xbox360: don't put paths in CC/CXX/LD

Browse Source
This commit is contained in:
Brad Parker
2017-09-17 10:48:41 -04:00
parent f21f6607c9
commit b350d29e67
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.libretro
View File

@@ -432,21 +432,24 @@ PSS_STYLE :=2
CFLAGS += -D_XBOX -D_XBOX1 CFLAGS += -D_XBOX -D_XBOX1
CXXFLAGS += -D_XBOX -D_XBOX1 CXXFLAGS += -D_XBOX -D_XBOX1
STATIC_LINKING=1 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
MSVCBINDIRPREFIX = $(XEDK)/bin/win32 CC = "cl.exe"
CC = "$(MSVCBINDIRPREFIX)/cl.exe" CXX = "cl.exe"
CXX = "$(MSVCBINDIRPREFIX)/cl.exe" LD = "lib.exe"
LD = "$(MSVCBINDIRPREFIX)/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)
PSS_STYLE :=2 PSS_STYLE :=2
CFLAGS += -D_XBOX -D_XBOX360 CFLAGS += -D_XBOX -D_XBOX360
CXXFLAGS += -D_XBOX -D_XBOX360 CXXFLAGS += -D_XBOX -D_XBOX360
ENDIANNESS_DEFINES += -DMSB_FIRST ENDIANNESS_DEFINES += -DMSB_FIRST
STATIC_LINKING=1 STATIC_LINKING=1
# Windows MSVC 2005 x86 # Windows MSVC 2005 x86
else ifeq ($(platform), windows_msvc2005_x86) else ifeq ($(platform), windows_msvc2005_x86)
CC = cl.exe CC = cl.exe
@@ -466,6 +469,7 @@ TARGET := $(TARGET_NAME)_libretro.dll
PSS_STYLE :=2 PSS_STYLE :=2
LDFLAGS += -DLL LDFLAGS += -DLL
CFLAGS += -D_CRT_SECURE_NO_DEPRECATE CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
# Windows MSVC 2003 x86 # Windows MSVC 2003 x86
else ifeq ($(platform), windows_msvc2003_x86) else ifeq ($(platform), windows_msvc2003_x86)
CC = cl.exe CC = cl.exe
@@ -485,6 +489,7 @@ TARGET := $(TARGET_NAME)_libretro.dll
PSS_STYLE :=2 PSS_STYLE :=2
LDFLAGS += -DLL LDFLAGS += -DLL
CFLAGS += -D_CRT_SECURE_NO_DEPRECATE CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
# Windows # Windows
else else
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll