diff options
author | Angelo Salese <angelosa@users.noreply.github.com> | 2012-04-22 14:10:44 +0000 |
---|---|---|
committer | Angelo Salese <angelosa@users.noreply.github.com> | 2012-04-22 14:10:44 +0000 |
commit | ded30e907e3d77af8b2c623438564849904aee30 (patch) | |
tree | ab03644feae00b71fa6273bad759f6e0d5893113 /src/osd | |
parent | b6791d3348ed2dc5e384f691f3d1eb358e7ae509 (diff) |
Clean-ups and version bumpmame0145u7
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/sdl/sdl.mak | 2 | ||||
-rw-r--r-- | src/osd/windows/windows.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 892d3e62ec6..4313cab303e 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -365,7 +365,7 @@ LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread DEFS += -DMACOSX_USE_LIBSDL endif # MACOSX_USE_LIBSDL -else # ifeq ($(TARGETOS),macosx) +else # ifeq ($(TARGETOS),macosx) DEFS += -DSDLMAME_UNIX DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak index ffb92f6c71e..1870c8cd918 100644 --- a/src/osd/windows/windows.mak +++ b/src/osd/windows/windows.mak @@ -162,7 +162,7 @@ CPPONLYFLAGS += /wd4371 # disable side effects warning in STL headers CPPONLYFLAGS += /wd4548 - + # disable macro redefinition warning CCOMFLAGS += /wd4005 |