diff options
author | R. Belmont <rb6502@users.noreply.github.com> | 2012-12-27 20:52:52 +0000 |
---|---|---|
committer | R. Belmont <rb6502@users.noreply.github.com> | 2012-12-27 20:52:52 +0000 |
commit | 8d293ac840b16f7b716a483bf55cadafcbbb89f8 (patch) | |
tree | 1f55bb5cb86afe35cfad0e9889c40a12097e2f74 /src/osd | |
parent | c5268b2af5629d23bec13327cc323c3ef82a002e (diff) |
SDL: Work around Qt differences between Fedora and everyone else [qmc2]
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/sdl/sdl.mak | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index b09097e4105..6fda230a42f 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -450,7 +450,28 @@ else # ifeq ($(TARGETOS),macosx) DEFS += -DSDLMAME_UNIX ifdef USE_QTDEBUG -MOC = @moc-qt4 +MOCTST = $(shell which moc-qt4 2>/dev/null) +ifeq '$(MOCTST)' '' +MOCTST = $(shell which moc 2>/dev/null) +ifeq '$(MOCTST)' '' +$(error Qt's Meta Object Compiler (moc) wasn't found!) +else +MOC = @$(MOCTST) +endif +else +MOC = @$(MOCTST) +endif +# Qt on Linux/UNIX +QMAKE = $(shell which qmake-qt4 2>/dev/null) +ifeq '$(QMAKE)' '' +QMAKE = $(shell which qmake 2>/dev/null) +ifeq '$(QMAKE)' '' +$(error qmake wasn't found!) +endif +endif +QT_INSTALL_HEADERS = $(shell $(QMAKE) -query QT_INSTALL_HEADERS) +INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS) +LIBS += -L$(shell $(QMAKE) -query QT_INSTALL_LIBS) -lQtGui -lQtCore else DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o endif |