summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2012-06-19 01:25:24 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2012-06-19 01:25:24 +0000
commit994de882e9256d546598211e7b088552d6dda1d1 (patch)
treef6a8592f709f97d75bb5dac2cd05e5c677237de8 /src/osd/sdl
parent7aa2b1537124c1494f6b714d1db62f3fa46ddcfc (diff)
SDL: Clean up GCC 4.7 test so it's the same path on all targets (nw)
Diffstat (limited to 'src/osd/sdl')
-rw-r--r--src/osd/sdl/sdl.mak25
1 files changed, 10 insertions, 15 deletions
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
@@ -281,17 +281,6 @@ $(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
#-------------------------------------------------
@@ -356,6 +345,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
#-------------------------------------------------
ifeq ($(BASE_TARGETOS),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