diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-06-18 16:06:11 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-06-18 16:06:11 +0000 |
commit | 85cda5148655a436e62a16f8923f47cbccf07dc3 (patch) | |
tree | 32f026e86cb23fc0f5513785457064370d4a5d65 /src/osd | |
parent | f1e3bf44a71ff1c5af10346ba1063c1348513c2e (diff) |
Make it compile on windows mingw 4.7.x (no whatsnew)
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/sdl/sdl.mak | 3 | ||||
-rw-r--r-- | src/osd/windows/windows.mak | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index bdd6f42c401..39e73332ac7 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -474,6 +474,9 @@ 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 diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak index 172a98066d0..2dad455fddd 100644 --- a/src/osd/windows/windows.mak +++ b/src/osd/windows/windows.mak @@ -252,7 +252,9 @@ 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 # add the windows libraries LIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -ldinput8 -lwsock32 |