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

Added GCC check in windows.mak and win32 part of sdl.mak and also did silence of gcc 4.6 in win32 specific video.c (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2011-12-15 08:17:18 +00:00
parent e97020e394
commit f23a3ef001
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,6 +398,11 @@ endif
# Static linking # Static linking
LDFLAGS += -static-libgcc LDFLAGS += -static-libgcc
TEST_GCC = $(shell gcc --version)
ifeq ($(findstring 4.4,$(TEST_GCC)),)
#if we use new tools
LDFLAGS += -static-libstdc++
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

1
src/osd/sdl/video.c
View File

@ -397,6 +397,7 @@ static BOOL CALLBACK monitor_enum_callback(HMONITOR handle, HDC dc, LPRECT rect,
info.cbSize = sizeof(info); info.cbSize = sizeof(info);
result = GetMonitorInfo(handle, (LPMONITORINFO)&info); result = GetMonitorInfo(handle, (LPMONITORINFO)&info);
assert(result); assert(result);
result++; // to silence gcc 4.6
// allocate a new monitor info // allocate a new monitor info
monitor = global_alloc_clear(sdl_monitor_info); monitor = global_alloc_clear(sdl_monitor_info);

5
src/osd/windows/windows.mak
View File

@ -246,6 +246,11 @@ endif
# ensure we statically link the gcc runtime lib # ensure we statically link the gcc runtime lib
LDFLAGS += -static-libgcc LDFLAGS += -static-libgcc
TEST_GCC = $(shell gcc --version)
ifeq ($(findstring 4.4,$(TEST_GCC)),)
#if we use new tools
LDFLAGS += -static-libstdc++
endif
# add the windows libraries # add the windows libraries
LIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -ldinput8 -lwsock32 LIBS += -luser32 -lgdi32 -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi -ldinput8 -lwsock32