Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved some version checks in makefiles / added TODOs (nw)

Browse Source
This commit is contained in:
Oliver Stöneberg 2013-01-28 08:49:47 +00:00
parent 6e55330882
commit 093d2460fb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osd/sdl/sdl.mak
View File

@ -436,12 +436,9 @@ SDLOS_TARGETOS = $(BASE_TARGETOS)
# TEST_GCC for GCC version-specific stuff # TEST_GCC for GCC version-specific stuff
#------------------------------------------------- #-------------------------------------------------
# TODO: needs to use $(CC)
TEST_GCC = $(shell gcc --version) TEST_GCC = $(shell gcc --version)
ifeq ($(findstring 4.7,$(TEST_GCC)),4.7)
CCOMFLAGS += -Wno-narrowing -Wno-attributes
endif
# Ubuntu 12.10 GCC 4.7.2 autodetect # Ubuntu 12.10 GCC 4.7.2 autodetect
ifeq ($(findstring 4.7.2-2ubuntu1,$(TEST_GCC)),4.7.2-2ubuntu1) ifeq ($(findstring 4.7.2-2ubuntu1,$(TEST_GCC)),4.7.2-2ubuntu1)
GCC46TST = $(shell which g++-4.6 2>/dev/null) GCC46TST = $(shell which g++-4.6 2>/dev/null)
@ -450,6 +447,11 @@ $(error Ubuntu 12.10 detected. Please install the gcc-4.6 and g++-4.6 packages)
endif endif
CC = @gcc-4.6 CC = @gcc-4.6
LD = @g++-4.6 LD = @g++-4.6
TEST_GCC = $(shell gcc-4.6 --version)
endif
ifeq ($(findstring 4.7.,$(TEST_GCC)),4.7.)
CCOMFLAGS += -Wno-narrowing -Wno-attributes
endif endif
#------------------------------------------------- #-------------------------------------------------

3
src/osd/windows/windows.mak
View File

@ -253,8 +253,9 @@ CCOMFLAGS += -include $(WINSRC)/winprefix.h
# ensure we statically link the gcc runtime lib # ensure we statically link the gcc runtime lib
LDFLAGS += -static-libgcc LDFLAGS += -static-libgcc
# TODO: needs to use $(CC)
TEST_GCC = $(shell gcc --version) TEST_GCC = $(shell gcc --version)
ifeq ($(findstring 4.4,$(TEST_GCC)),) ifeq ($(findstring 4.4.,$(TEST_GCC)),)
#if we use new tools #if we use new tools
LDFLAGS += -static-libstdc++ LDFLAGS += -static-libstdc++
endif endif