diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 39e73332ac7..83f0b892d17 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -280,17 +280,6 @@ ifeq ($(BASE_TARGETOS),) $(error $(TARGETOS) not supported !) 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 #------------------------------------------------- @@ -355,6 +344,16 @@ INCPATH += -include $(SDLSRC)/sdlprefix.h 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 #------------------------------------------------- @@ -469,14 +468,10 @@ endif # Static linking LDFLAGS += -static-libgcc -TEST_GCC = $(shell gcc --version) ifeq ($(findstring 4.4,$(TEST_GCC)),) #if we use new tools LDFLAGS += -static-libstdc++ endif -ifeq ($(findstring 4.7,$(TEST_GCC)),4.7) - CCOMFLAGS += -Wno-narrowing -Wno-attributes -endif LIBS += -lSDL.dll LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi