summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2013-01-28 08:49:47 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2013-01-28 08:49:47 +0000
commit093d2460fbbf789cc87a2280edd29b385d845508 (patch)
tree5b684d14261d1868cbbbe58ff97faaf72214e186 /src/osd
parent6e553308829f83d2fe242a526d377c2c8dad389c (diff)
improved some version checks in makefiles / added TODOs (nw)
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/sdl/sdl.mak10
-rw-r--r--src/osd/windows/windows.mak3
2 files changed, 8 insertions, 5 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 707843ff88c..1447caa5437 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -436,12 +436,9 @@ SDLOS_TARGETOS = $(BASE_TARGETOS)
# TEST_GCC for GCC version-specific stuff
#-------------------------------------------------
+# TODO: needs to use $(CC)
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
ifeq ($(findstring 4.7.2-2ubuntu1,$(TEST_GCC)),4.7.2-2ubuntu1)
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
CC = @gcc-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
#-------------------------------------------------
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 809fa259426..b0241502c74 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -253,8 +253,9 @@ CCOMFLAGS += -include $(WINSRC)/winprefix.h
# ensure we statically link the gcc runtime lib
LDFLAGS += -static-libgcc
+# TODO: needs to use $(CC)
TEST_GCC = $(shell gcc --version)
-ifeq ($(findstring 4.4,$(TEST_GCC)),)
+ifeq ($(findstring 4.4.,$(TEST_GCC)),)
#if we use new tools
LDFLAGS += -static-libstdc++
endif