fix non-360 MSVC builds and add generic DEBUG handling for msvc and non-msvc

This commit is contained in:
Brad Parker
2017-09-14 13:34:21 -07:00
parent 6ba4fa631c
commit f13a890f45

View File

@@ -422,16 +422,17 @@ LDFLAGS += -DLL
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 MSVCBINDIRPREFIX = $(XEDK)/bin/win32
CC = "$(MSVCBINDIRPREFIX)/cl.exe" CC = cl.exe
CXX = "$(MSVCBINDIRPREFIX)/cl.exe" CXX = cl.exe
PATH := $(shell IFS=$$'\n'; cygpath "$(MSVCBINDIRPREFIX)"):$(PATH)
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include") INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
export INCLUDE := $(INCLUDE) export INCLUDE := $(INCLUDE)
export LIB := $(XEDK)/lib/xbox export LIB := $(XEDK)/lib/xbox
PSS_STYLE :=2 PSS_STYLE :=2
CFLAGS += -D_XBOX -D_XBOX360 -MT CFLAGS += -D_XBOX -D_XBOX360
CXXFLAGS += -D_XBOX -D_XBOX360 -MT CXXFLAGS += -D_XBOX -D_XBOX360
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)
@@ -480,9 +481,37 @@ else
endif endif
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
ifneq (,$(findstring msvc,$(platform)))
ifeq ($(STATIC_LINKING),1)
CFLAGS += -MTd
CXXFLAGS += -MTd
else
CFLAGS += -MDd
CXXFLAGS += -MDd
endif
CFLAGS += -Od -Zi -DDEBUG -D_DEBUG
CXXFLAGS += -Od -Zi -DDEBUG -D_DEBUG
else
CFLAGS += -O0 -g -DDEBUG CFLAGS += -O0 -g -DDEBUG
CXXFLAGS += -O0 -g -DDEBUG
endif
else
ifneq (,$(findstring msvc,$(platform)))
ifeq ($(STATIC_LINKING),1)
CFLAGS += -MT
CXXFLAGS += -MT
else
CFLAGS += -MD
CXXFLAGS += -MD
endif
CFLAGS += -O2 -DNDEBUG
CXXFLAGS += -O2 -DNDEBUG
else else
CFLAGS += -O2 -DNDEBUG CFLAGS += -O2 -DNDEBUG
CXXFLAGS += -O2 -DNDEBUG
endif
endif endif
ifeq ($(EXTERNAL_ZLIB), 1) ifeq ($(EXTERNAL_ZLIB), 1)
@@ -524,10 +553,10 @@ ifneq (,$(findstring msvc,$(platform)))
OBJOUT = -Fo OBJOUT = -Fo
LINKOUT = -out: LINKOUT = -out:
ifeq ($(STATIC_LINKING),1) ifeq ($(STATIC_LINKING),1)
LD = "$(MSVCBINDIRPREFIX)/lib.exe" LD = lib.exe
STATIC_LINKING=0 STATIC_LINKING=0
else else
LD = "$(MSVCBINDIRPREFIX)/link.exe" LD = link.exe
endif endif
else else
OBJOUT = -o OBJOUT = -o