Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-25 07:15:25 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: Clean up GCC 4.7 test so it's the same path on all targets (nw)

Browse Source
This commit is contained in:
R. Belmont 2012-06-19 01:25:24 +00:00
parent 7aa2b15371
commit 994de882e9
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,17 +280,6 @@ ifeq ($(BASE_TARGETOS),)
$(error $(TARGETOS) not supported !) $(error $(TARGETOS) not supported !)
endif endif
#-------------------------------------------------
# GCC 4.7 workaround (discrete audio needs type-safe rewrite to fix this for real)
#-------------------------------------------------
ifneq ($(BASE_TARGETOS),win32)
CCVERS = $(shell gcc --version)
ifneq (,$(findstring 4.7,$(CCVERS)))
CCOMFLAGS += -Wno-narrowing -Wno-attributes
endif
endif
#------------------------------------------------- #-------------------------------------------------
# object and source roots # object and source roots
#------------------------------------------------- #-------------------------------------------------
@ -355,6 +344,16 @@ INCPATH += -include $(SDLSRC)/sdlprefix.h
SDLOS_TARGETOS = $(BASE_TARGETOS) SDLOS_TARGETOS = $(BASE_TARGETOS)
#-------------------------------------------------
# TEST_GCC for GCC version-specific stuff
#-------------------------------------------------
TEST_GCC = $(shell gcc --version)
ifeq ($(findstring 4.7,$(TEST_GCC)),4.7)
CCOMFLAGS += -Wno-narrowing -Wno-attributes
endif
#------------------------------------------------- #-------------------------------------------------
# Unix # Unix
#------------------------------------------------- #-------------------------------------------------
@ -469,14 +468,10 @@ endif
# Static linking # Static linking
LDFLAGS += -static-libgcc LDFLAGS += -static-libgcc
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
ifeq ($(findstring 4.7,$(TEST_GCC)),4.7)
CCOMFLAGS += -Wno-narrowing -Wno-attributes
endif
LIBS += -lSDL.dll LIBS += -lSDL.dll
LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi