ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7772 from orbea/opt 

Makefile: Better respect CFLAGS and CXXFLAGS as environment variables.
This commit is contained in:
Twinaphex 2019-01-05 17:21:16 +01:00 committed by GitHub
parent e70806c51c fb6fe1a87c
commit e827c3648f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -16,28 +16,35 @@ include config.mk
TARGET = retroarch TARGET = retroarch
OBJ :=
LIBS :=
DEF_FLAGS :=
DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
OBJDIR_BASE := obj-unix OBJDIR_BASE := obj-unix
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
OBJDIR := $(OBJDIR_BASE)/debug OBJDIR := $(OBJDIR_BASE)/debug
CFLAGS ?= -O0 -g
CXXFLAGS ?= -O0 -g
DEFINES += -DDEBUG -D_DEBUG
else else
OBJDIR := $(OBJDIR_BASE)/release OBJDIR := $(OBJDIR_BASE)/release
CFLAGS ?= -O3
CXXFLAGS ?= -O3
DEF_FLAGS += -ffast-math
endif endif
OBJ :=
LIBS :=
DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
ifneq ($(findstring BSD,$(OS)),) ifneq ($(findstring BSD,$(OS)),)
CFLAGS += -DBSD DEF_FLAGS += -DBSD
LDFLAGS += -L/usr/local/lib LDFLAGS += -L/usr/local/lib
UDEV_CFLAGS += -I/usr/local/include/libepoll-shim UDEV_CFLAGS += -I/usr/local/include/libepoll-shim
UDEV_LIBS += -lepoll-shim UDEV_LIBS += -lepoll-shim
endif endif
ifneq ($(findstring DOS,$(OS)),) ifneq ($(findstring DOS,$(OS)),)
CFLAGS += -march=i386 DEF_FLAGS += -march=i386
LDFLAGS += -lemu LDFLAGS += -lemu
endif endif
@ -77,15 +84,8 @@ ifneq ($(V),1)
Q := @ Q := @
endif endif
ifeq ($(DEBUG), 1)
OPTIMIZE_FLAG = -O0 -g
DEFINES += -DDEBUG -D_DEBUG
else
OPTIMIZE_FLAG = -O3 -ffast-math
endif
ifeq ($(HAVE_DRMINGW), 1) ifeq ($(HAVE_DRMINGW), 1)
CFLAGS += -DHAVE_DRMINGW DEF_FLAGS += -DHAVE_DRMINGW
LDFLAGS += $(DRMINGW_LIBS) LDFLAGS += $(DRMINGW_LIBS)
endif endif
@ -93,10 +93,10 @@ ifneq ($(findstring Win32,$(OS)),)
LDFLAGS += -mwindows LDFLAGS += -mwindows
endif endif
CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb DEF_FLAGS += -Wall $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
APPEND_CFLAGS := $(CFLAGS) CFLAGS += $(DEF_FLAGS)
CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS CXXFLAGS += $(DEF_FLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
OBJCFLAGS := $(CFLAGS) -D__STDC_CONSTANT_MACROS OBJCFLAGS := $(CFLAGS) -D__STDC_CONSTANT_MACROS
ifeq ($(HAVE_CXX), 1) ifeq ($(HAVE_CXX), 1)

53
Makefile.common
View File

@ -4,7 +4,7 @@ LIBRETRO_COMM_DIR := $(ROOT_DIR)/libretro-common
WANT_WGL = 0 WANT_WGL = 0
ifeq ($(HAVE_STACK_USAGE), 1) ifeq ($(HAVE_STACK_USAGE), 1)
CFLAGS += -fstack-usage DEF_FLAGS += -fstack-usage
endif endif
ifeq ($(HAVE_GL_CONTEXT),) ifeq ($(HAVE_GL_CONTEXT),)
@ -65,13 +65,11 @@ ifeq ($(HAVE_PRESERVE_DYLIB),1)
endif endif
ifeq ($(GL_DEBUG), 1) ifeq ($(GL_DEBUG), 1)
CFLAGS += -DGL_DEBUG DEF_FLAGS += -DGL_DEBUG
CXXFLAGS += -DGL_DEBUG
endif endif
ifeq ($(VULKAN_DEBUG), 1) ifeq ($(VULKAN_DEBUG), 1)
CFLAGS += -DVULKAN_DEBUG DEF_FLAGS += -DVULKAN_DEBUG
CXXFLAGS += -DVULKAN_DEBUG
endif endif
ifeq ($(HAVE_HARD_FLOAT), 1) ifeq ($(HAVE_HARD_FLOAT), 1)
@ -83,23 +81,23 @@ ifeq ($(TDM_GCC),)
endif endif
ifeq ($(HAVE_FILE_LOGGER), 1) ifeq ($(HAVE_FILE_LOGGER), 1)
CFLAGS += -DHAVE_FILE_LOGGER DEF_FLAGS += -DHAVE_FILE_LOGGER
endif endif
ifeq ($(HAVE_SHADERPIPELINE), 1) ifeq ($(HAVE_SHADERPIPELINE), 1)
CFLAGS += -DHAVE_SHADERPIPELINE DEF_FLAGS += -DHAVE_SHADERPIPELINE
endif endif
CFLAGS += -I$(LIBRETRO_COMM_DIR)/include -I$(DEPS_DIR) DEF_FLAGS += -I$(LIBRETRO_COMM_DIR)/include -I$(DEPS_DIR)
# Switches # Switches
# #
ifeq ($(HAVE_NETPLAYDISCOVERY), 1) ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
CFLAGS += -DHAVE_NETPLAYDISCOVERY DEF_FLAGS += -DHAVE_NETPLAYDISCOVERY
endif endif
ifeq ($(HAVE_NETLOGGER), 1) ifeq ($(HAVE_NETLOGGER), 1)
CFLAGS += -DHAVE_LOGGER DEF_FLAGS += -DHAVE_LOGGER
DEFINES += -DHAVE_LOGGER DEFINES += -DHAVE_LOGGER
OBJ += network/net_logger.o OBJ += network/net_logger.o
endif endif
@ -151,7 +149,7 @@ endif
# General object files # General object files
DEFINES += -DHAVE_DR_MP3 DEFINES += -DHAVE_DR_MP3
CFLAGS += -DHAVE_DR_MP3 DEF_FLAGS += -DHAVE_DR_MP3
OBJ += frontend/frontend.o \ OBJ += frontend/frontend.o \
frontend/frontend_driver.o \ frontend/frontend_driver.o \
@ -839,7 +837,7 @@ ifeq ($(HAVE_VITA2D), 1)
OBJ += gfx/drivers/vita2d_gfx.o \ OBJ += gfx/drivers/vita2d_gfx.o \
gfx/drivers_font/vita2d_font.o gfx/drivers_font/vita2d_font.o
CFLAGS += -I$(DEPS_DIR)/libvita2d/include DEF_FLAGS += -I$(DEPS_DIR)/libvita2d/include
endif endif
ifeq ($(TARGET), retroarch_3ds) ifeq ($(TARGET), retroarch_3ds)
@ -940,7 +938,7 @@ endif
ifeq ($(HAVE_DBUS), 1) ifeq ($(HAVE_DBUS), 1)
LIBS += $(DBUS_LIBS) LIBS += $(DBUS_LIBS)
CFLAGS += $(DBUS_CFLAGS) DEF_FLAGS += $(DBUS_CFLAGS)
OBJ += gfx/common/dbus_common.o OBJ += gfx/common/dbus_common.o
endif endif
@ -1035,7 +1033,7 @@ endif
ifeq ($(HAVE_SIXEL), 1) ifeq ($(HAVE_SIXEL), 1)
DEFINES += -DHAVE_SIXEL DEFINES += -DHAVE_SIXEL
CFLAGS += -I/usr/include/sixel DEF_FLAGS += -I/usr/include/sixel
OBJ += gfx/drivers/sixel_gfx.o gfx/drivers_font/sixel_font.o \ OBJ += gfx/drivers/sixel_gfx.o gfx/drivers_font/sixel_font.o \
gfx/drivers_context/sixel_ctx.o gfx/drivers_context/sixel_ctx.o
LIBS += -lsixel LIBS += -lsixel
@ -1047,7 +1045,7 @@ endif
ifeq ($(HAVE_PLAIN_DRM), 1) ifeq ($(HAVE_PLAIN_DRM), 1)
OBJ += gfx/drivers/drm_gfx.o OBJ += gfx/drivers/drm_gfx.o
CFLAGS += -I/usr/include/libdrm DEF_FLAGS += -I/usr/include/libdrm
LIBS += -ldrm LIBS += -ldrm
endif endif
@ -1330,7 +1328,7 @@ ifneq ($(findstring 1, $(HAVE_D3D10) $(HAVE_D3D11) $(HAVE_D3D12)),)
INCLUDE_DIRS += -isystemgfx/include/dxsdk INCLUDE_DIRS += -isystemgfx/include/dxsdk
OBJ += gfx/common/d3dcompiler_common.o \ OBJ += gfx/common/d3dcompiler_common.o \
gfx/common/dxgi_common.o gfx/common/dxgi_common.o
CFLAGS += -Wno-unknown-pragmas DEF_FLAGS += -Wno-unknown-pragmas
endif endif
ifeq ($(HAVE_D3D8), 1) ifeq ($(HAVE_D3D8), 1)
@ -1446,7 +1444,7 @@ OBJ += $(LIBRETRO_COMM_DIR)/file/archive_file.o \
$(LIBRETRO_COMM_DIR)/streams/trans_stream_pipe.o $(LIBRETRO_COMM_DIR)/streams/trans_stream_pipe.o
ifeq ($(HAVE_7ZIP),1) ifeq ($(HAVE_7ZIP),1)
CFLAGS += -I$(DEPS_DIR)/7zip DEF_FLAGS += -I$(DEPS_DIR)/7zip
HAVE_COMPRESSION = 1 HAVE_COMPRESSION = 1
DEFINES += -DHAVE_7ZIP -D_7ZIP_ST DEFINES += -DHAVE_7ZIP -D_7ZIP_ST
7ZOBJ = $(DEPS_DIR)/7zip/7zIn.o \ 7ZOBJ = $(DEPS_DIR)/7zip/7zIn.o \
@ -1475,8 +1473,8 @@ endif
ifeq ($(HAVE_BUILTINFLAC),1) ifeq ($(HAVE_BUILTINFLAC),1)
HAVE_FLAC = 1 HAVE_FLAC = 1
DEFINES += -DHAVE_DR_FLAC -I$(DEPS_DIR) DEFINES += -DHAVE_DR_FLAC -I$(DEPS_DIR)
CFLAGS += -DHAVE_DR_FLAC DEF_FLAGS += -DHAVE_DR_FLAC
CFLAGS += -DHAVE_FLAC -I$(DEPS_DIR)/libFLAC/include DEF_FLAGS += -DHAVE_FLAC -I$(DEPS_DIR)/libFLAC/include
DEFINES += -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \ DEFINES += -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
-DFLAC_PACKAGE_VERSION="\"retroarch\"" -DFLAC_PACKAGE_VERSION="\"retroarch\""
FLACOBJ = $(DEPS_DIR)/libFLAC/bitmath.o \ FLACOBJ = $(DEPS_DIR)/libFLAC/bitmath.o \
@ -1534,7 +1532,7 @@ ifeq ($(HAVE_ZLIB), 1)
endif endif
ifeq ($(HAVE_CHD), 1) ifeq ($(HAVE_CHD), 1)
CFLAGS += -I$(LIBRETRO_COMM_DIR)/formats/libchdr DEF_FLAGS += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \ OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \ $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
@ -1826,7 +1824,7 @@ endif
ifeq ($(WANT_IOSUHAX), 1) ifeq ($(WANT_IOSUHAX), 1)
DEFINES += -I$(DEPS_DIR)/libiosuhax DEFINES += -I$(DEPS_DIR)/libiosuhax
CFLAGS += -I$(DEPS_DIR)/libiosuhax DEF_FLAGS += -I$(DEPS_DIR)/libiosuhax
OBJ += $(DEPS_DIR)/libiosuhax/iosuhax.o \ OBJ += $(DEPS_DIR)/libiosuhax/iosuhax.o \
$(DEPS_DIR)/libiosuhax/iosuhax_devoptab.o \ $(DEPS_DIR)/libiosuhax/iosuhax_devoptab.o \
$(DEPS_DIR)/libiosuhax/iosuhax_disc_interface.o $(DEPS_DIR)/libiosuhax/iosuhax_disc_interface.o
@ -1834,7 +1832,7 @@ endif
ifeq ($(WANT_LIBFAT), 1) ifeq ($(WANT_LIBFAT), 1)
DEFINES += -I$(DEPS_DIR)/libfat/include DEFINES += -I$(DEPS_DIR)/libfat/include
CFLAGS += -I$(DEPS_DIR)/libfat/include DEF_FLAGS += -I$(DEPS_DIR)/libfat/include
OBJ += $(DEPS_DIR)/libfat/cache.o \ OBJ += $(DEPS_DIR)/libfat/cache.o \
$(DEPS_DIR)/libfat/directory.o \ $(DEPS_DIR)/libfat/directory.o \
$(DEPS_DIR)/libfat/disc.o \ $(DEPS_DIR)/libfat/disc.o \
@ -1868,7 +1866,7 @@ endif
# Help at https://modmyclassic.com/comp # Help at https://modmyclassic.com/comp
ifeq ($(HAVE_CLASSIC), 1) ifeq ($(HAVE_CLASSIC), 1)
CFLAGS += -DHAVE_CLASSIC DEF_FLAGS += -DHAVE_CLASSIC
endif endif
ifeq ($(HAVE_C_A7A7), 1) ifeq ($(HAVE_C_A7A7), 1)
@ -1880,12 +1878,11 @@ ifeq ($(HAVE_C_A7A7), 1)
-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \ -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
-fmerge-all-constants -fno-math-errno \ -fmerge-all-constants -fno-math-errno \
-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
CFLAGS += $(C_A7A7_OPT) DEF_FLAGS += $(C_A7A7_OPT)
CXXFLAGS += $(C_A7A7_OPT)
ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1) ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
CFLAGS += -march=armv7-a DEF_FLAGS += -march=armv7-a
else else
CFLAGS += -march=armv7ve DEF_FLAGS += -march=armv7ve
# If gcc is 5.0 or later # If gcc is 5.0 or later
ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1) ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
LDFLAGS += -static-libgcc -static-libstdc++ LDFLAGS += -static-libgcc -static-libstdc++
@ -1894,6 +1891,6 @@ ifeq ($(HAVE_C_A7A7), 1)
endif endif
ifeq ($(HAVE_HAKCHI), 1) ifeq ($(HAVE_HAKCHI), 1)
CFLAGS += -DHAVE_HAKCHI DEF_FLAGS += -DHAVE_HAKCHI
endif endif
################################## ##################################

1
Makefile.ctr
View File

@ -80,6 +80,7 @@ else
#HAVE_BUILTINMBEDTLS = 1 #HAVE_BUILTINMBEDTLS = 1
include Makefile.common include Makefile.common
CFLAGS += $(DEF_FLAGS)
BLACKLIST := BLACKLIST :=
BLACKLIST += input/input_overlay.o BLACKLIST += input/input_overlay.o
BLACKLIST += tasks/task_overlay.o BLACKLIST += tasks/task_overlay.o

2
Makefile.emscripten
View File

@ -57,7 +57,7 @@ endif
include Makefile.common include Makefile.common
CFLAGS += -Ideps/libz -Ideps -Ideps/stb CFLAGS += $(DEF_FLAGS) -Ideps/libz -Ideps -Ideps/stb
libretro = libretro_emscripten.bc libretro = libretro_emscripten.bc
ifneq ($(V), 1) ifneq ($(V), 1)

12
Makefile.msvc
View File

@ -7,7 +7,6 @@ ARCH = amd64
BUILD_DIR = objs/msvc BUILD_DIR = objs/msvc
CXX_BUILD = 0 CXX_BUILD = 0
WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\$(NOTHING) WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\$(NOTHING)
WindowsSDKVersion := 10.0.14393.0\$(NOTHING) WindowsSDKVersion := 10.0.14393.0\$(NOTHING)
VCINSTALLDIR := C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\$(NOTHING) VCINSTALLDIR := C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\$(NOTHING)
@ -59,7 +58,7 @@ HAVE_IMAGEVIEWER := 1
include Makefile.common include Makefile.common
INCLUDE_DIRS := $(patsubst -isystem%,-I%,$(INCLUDE_DIRS)) INCLUDE_DIRS := $(patsubst -isystem%,-I%,$(INCLUDE_DIRS))
CFLAGS := $(filter-out -Wno-unknown-pragmas,$(CFLAGS)) CFLAGS := $(filter-out -Wno-unknown-pragmas,$(DEF_FLAGS))
CXXFLAGS := $(filter-out -fpermissive -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses,$(CXXFLAGS)) CXXFLAGS := $(filter-out -fpermissive -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses,$(CXXFLAGS))
LIBS := $(filter-out -lstdc++,$(LIBS)) LIBS := $(filter-out -lstdc++,$(LIBS))
@ -90,14 +89,12 @@ ifeq ($(ARCH),x86)
CROSS = CROSS =
endif endif
INCLUDE := $(VCINSTALLDIR)include;$(VCINSTALLDIR)atlmfc\include;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um; INCLUDE := $(VCINSTALLDIR)include;$(VCINSTALLDIR)atlmfc\include;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um;
LIB := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(TARGET_ARCH2);$(WindowsSdkDir)lib\$(WindowsSDKVersion)um\$(TARGET_ARCH2);C:\Program Files (x86)\NVIDIA Corporation\Cg\lib.$(TARGET_ARCH2);C:\Program Files (x86)\Microsoft DirectX SDK (February 2010)\Lib\$(TARGET_ARCH2); LIB := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(TARGET_ARCH2);$(WindowsSdkDir)lib\$(WindowsSDKVersion)um\$(TARGET_ARCH2);C:\Program Files (x86)\NVIDIA Corporation\Cg\lib.$(TARGET_ARCH2);C:\Program Files (x86)\Microsoft DirectX SDK (February 2010)\Lib\$(TARGET_ARCH2);
LIBPATH := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS); LIBPATH := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);
PATH := $(shell IFS=$$'\n'; cygpath "$(VCINSTALLDIR)bin\\$(CROSS)"):$(shell IFS=$$'\n'; cygpath "$(WindowsSdkDir)\bin\\$(ARCH2)"):$(PATH) PATH := $(shell IFS=$$'\n'; cygpath "$(VCINSTALLDIR)bin\\$(CROSS)"):$(shell IFS=$$'\n'; cygpath "$(WindowsSdkDir)\bin\\$(ARCH2)"):$(PATH)
export INCLUDE := $(INCLUDE) export INCLUDE := $(INCLUDE)
export LIB := $(LIB) export LIB := $(LIB)
export LIBPATH := $(LIBPATH) export LIBPATH := $(LIBPATH)
@ -144,7 +141,6 @@ RC = rc.exe
LIBS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib LIBS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
LDFLAGS += -nologo -wx -nxcompat -machine:$(TARGET_ARCH2) LDFLAGS += -nologo -wx -nxcompat -machine:$(TARGET_ARCH2)
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
FLAGS += -GS -Gy -Od -RTC1 -D_SECURE_SCL=1 -Zi FLAGS += -GS -Gy -Od -RTC1 -D_SECURE_SCL=1 -Zi
FLAGS += -MDd FLAGS += -MDd
@ -155,7 +151,6 @@ else
FLAGS += -MD FLAGS += -MD
endif endif
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
BUILD_DIR := $(BUILD_DIR)-debug BUILD_DIR := $(BUILD_DIR)-debug
endif endif
@ -170,7 +165,6 @@ ifneq ($(V), 1)
Q := @ Q := @
endif endif
ifeq ($(GRIFFIN_BUILD), 1) ifeq ($(GRIFFIN_BUILD), 1)
OBJ := griffin/griffin.o griffin/griffin_cpp.o OBJ := griffin/griffin.o griffin/griffin_cpp.o
DEFINES += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES DEFINES += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES
@ -188,9 +182,6 @@ OBJ := $(patsubst %rarch.o,%rarch.res,$(OBJ))
OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ)) OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
OBJ := $(OBJ:.o=.obj) OBJ := $(OBJ:.o=.obj)
LDFLAGS += -WX -SUBSYSTEM:WINDOWS -ENTRY:mainCRTStartup LDFLAGS += -WX -SUBSYSTEM:WINDOWS -ENTRY:mainCRTStartup
DEFINES := $(patsubst -f%,,$(DEFINES)) DEFINES := $(patsubst -f%,,$(DEFINES))
@ -198,7 +189,6 @@ LDFLAGS := $(patsubst -l%,%.lib,$(LDFLAGS))
LIBS := $(filter-out -lm,$(LIBS)) LIBS := $(filter-out -lm,$(LIBS))
LIBS := $(patsubst -l%,%.lib,$(LIBS)) LIBS := $(patsubst -l%,%.lib,$(LIBS))
#$(info INCLUDE_DIRS : $(INCLUDE_DIRS)) #$(info INCLUDE_DIRS : $(INCLUDE_DIRS))
#$(info DEFINES : $(DEFINES)) #$(info DEFINES : $(DEFINES))
#$(info CFLAGS : $(CFLAGS)) #$(info CFLAGS : $(CFLAGS))

2
Makefile.switch
View File

@ -34,13 +34,13 @@ else
HAVE_DYNAMIC = 1 HAVE_DYNAMIC = 1
include Makefile.common include Makefile.common
CFLAGS += $(DEF_FLAGS)
BLACKLIST := BLACKLIST :=
BLACKLIST += input/input_overlay.o BLACKLIST += input/input_overlay.o
BLACKLIST += tasks/task_overlay.o BLACKLIST += tasks/task_overlay.o
OBJ := $(filter-out $(BLACKLIST),$(OBJ)) OBJ := $(filter-out $(BLACKLIST),$(OBJ))
endif endif
ifeq ($(strip $(LIBTRANSISTOR_HOME)),) ifeq ($(strip $(LIBTRANSISTOR_HOME)),)
$(error "Please set LIBTRANSISTOR_HOME in your environment. export LIBTRANSISTOR_HOME=<path/to/libtransistor/dist/>") $(error "Please set LIBTRANSISTOR_HOME in your environment. export LIBTRANSISTOR_HOME=<path/to/libtransistor/dist/>")
endif endif

2
Makefile.vita
View File

@ -55,6 +55,7 @@ else
endif endif
include Makefile.common include Makefile.common
CFLAGS += $(DEF_FLAGS)
BLACKLIST := BLACKLIST :=
OBJ := $(filter-out $(BLACKLIST),$(OBJ)) OBJ := $(filter-out $(BLACKLIST),$(OBJ))
@ -64,7 +65,6 @@ else
OBJ += frontend/drivers/platform_psp.o OBJ += frontend/drivers/platform_psp.o
endif endif
ifeq ($(strip $(VITASDK)),) ifeq ($(strip $(VITASDK)),)
$(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk") $(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
endif endif

3
Makefile.win
View File

@ -102,7 +102,6 @@ else
WINDRES = windres WINDRES = windres
endif endif
libretro ?= -lretro libretro ?= -lretro
ifeq ($(DYNAMIC), 1) ifeq ($(DYNAMIC), 1)
@ -123,7 +122,7 @@ else
CXXFLAGS += -O3 -ffast-math CXXFLAGS += -O3 -ffast-math
endif endif
CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps CFLAGS += $(DEF_FLAGS) -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps
CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps -std=c++98 -D__STDC_CONSTANT_MACROS CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps -std=c++98 -D__STDC_CONSTANT_MACROS
ifeq ($(CXX_BUILD), 1) ifeq ($(CXX_BUILD), 1)
CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS

2
cores/libretro-ffmpeg/Makefile
View File

@ -195,7 +195,7 @@ CFLAGS += -D__LIBRETRO__
include Makefile.common include Makefile.common
CFLAGS += $(DEFINES) $(INCFLAGS) $(GLFLAGS) CFLAGS += $(DEFINES) $(INCFLAGS) $(GLFLAGS) $(DEF_FLAGS)
CFLAGS += -Wall $(fpic) CFLAGS += -Wall $(fpic)
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)

17
qb/qb.libs.sh
View File

@ -242,8 +242,21 @@ create_config_make()
printf %s\\n "Creating make config: $outfile" printf %s\\n "Creating make config: $outfile"
{ [ "$HAVE_CC" = 'yes' ] && printf %s\\n "CC = $CC" "CFLAGS = $CFLAGS" { if [ "$HAVE_CC" = 'yes' ]; then
[ "$HAVE_CXX" = 'yes' ] && printf %s\\n "CXX = $CXX" "CXXFLAGS = $CXXFLAGS" printf %s\\n "CC = $CC"
if [ "${CFLAGS}" ]; then
printf %s\\n "CFLAGS = $CFLAGS"
fi
fi
if [ "$HAVE_CXX" = 'yes' ]; then
printf %s\\n "CXX = $CXX"
if [ "${CXXFLAGS}" ]; then
printf %s\\n "CXXFLAGS = $CXXFLAGS"
fi
fi
printf %s\\n "WINDRES = $WINDRES" \ printf %s\\n "WINDRES = $WINDRES" \
"MOC = $MOC" \ "MOC = $MOC" \