Previous 199869 Revisions Next

r19860 Thursday 27th December, 2012 at 16:09:06 UTC by R. Belmont
SDL: Qt debugger support cleanup, fixed OS X crash [qmc2, R. Belmont]
[src/osd/sdl]debugqtview.c sdl.mak

trunk/src/osd/sdl/sdl.mak
r19859r19860
44#
55#   SDL-specific makefile
66#
7#   Copyright (c) 1996-2010, Nicola Salmoria and the MAME Team.
7#   Copyright (c) 1996-2013, Nicola Salmoria and the MAME Team.
88#   Visit http://mamedev.org for licensing and usage restrictions.
99#
1010#   SDLMAME by Olivier Galibert and R. Belmont
r19859r19860
7676# (currently defaults disabled due to causing issues with mouse capture, esp. in MESS)
7777NO_USE_XINPUT = 1
7878
79# uncomment to try the experimental new Qt debugger (Linux only for now)
79# uncomment to try the experimental new Qt debugger
8080#USE_QTDEBUG = 1
8181
8282###########################################################################
r19859r19860
305305INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS)
306306LIBS += -L$(shell qmake -query QT_INSTALL_LIBS) -lqtmain -lQtGui4 -lQtCore4 -lcomdlg32 -loleaut32 -limm32 -lwinspool -lmsimg32 -lole32 -luuid -lws2_32 -lshell32 -lkernel32 -mwindows
307307endif
308endif
308309
310ifeq ($(TARGETOS),macosx)
311ifdef USE_QTDEBUG
312MOC = @moc
313
314QT_INSTALL_LIBS = $(shell qmake -query QT_INSTALL_LIBS)
315INCPATH += -I$(QT_INSTALL_LIBS)/QtGui.framework/Versions/4/Headers -I$(QT_INSTALL_LIBS)/QtCore.framework/Versions/4/Headers -F$(QT_INSTALL_LIBS)
316LIBS += -L$(QT_INSTALL_LIBS) -F$(QT_INSTALL_LIBS) -framework QtCore -framework QtGui
309317endif
318endif
310319
311320ifeq ($(TARGETOS),os2)
312321BASE_TARGETOS = os2
r19859r19860
420429OSDCOREOBJS += $(SDLOBJ)/osxutils.o
421430SDLOS_TARGETOS = macosx
422431
423ifdef USE_QTDEBUG
424MOC = @moc
425$(SDLOBJ)/%.moc.c: $(SDLSRC)/%.h
426   $(MOC) $(MOCINCPATH) $(DEFS) $< -o $@
427
428DEBUGOBJS = \
429   $(SDLOBJ)/debugqt.o \
430   $(SDLOBJ)/debugqtview.o \
431   $(SDLOBJ)/debugqtwindow.o \
432   $(SDLOBJ)/debugqtlogwindow.o \
433   $(SDLOBJ)/debugqtdasmwindow.o \
434   $(SDLOBJ)/debugqtmainwindow.o \
435   $(SDLOBJ)/debugqtmemorywindow.o \
436   $(SDLOBJ)/debugqtwindow.moc.o \
437   $(SDLOBJ)/debugqtlogwindow.moc.o \
438   $(SDLOBJ)/debugqtdasmwindow.moc.o \
439   $(SDLOBJ)/debugqtmainwindow.moc.o \
440   $(SDLOBJ)/debugqtmemorywindow.moc.o
441
442LIBS += -framework QtCore -framework QtGui
443endif
444
445432ifndef MACOSX_USE_LIBSDL
446433# Compile using framework (compile using libSDL is the exception)
447434LIBS += -framework SDL -framework Cocoa -framework OpenGL -lpthread
r19859r19860
464451
465452ifdef USE_QTDEBUG
466453MOC = @moc-qt4
467$(SDLOBJ)/%.moc.c: $(SDLSRC)/%.h
468   $(MOC) $(MOCINCPATH) $(DEFS) $< -o $@
469
470DEBUGOBJS = \
471   $(SDLOBJ)/debugqt.o \
472   $(SDLOBJ)/debugqtview.o \
473   $(SDLOBJ)/debugqtwindow.o \
474   $(SDLOBJ)/debugqtlogwindow.o \
475   $(SDLOBJ)/debugqtdasmwindow.o \
476   $(SDLOBJ)/debugqtmainwindow.o \
477   $(SDLOBJ)/debugqtmemorywindow.o \
478   $(SDLOBJ)/debugqtwindow.moc.o \
479   $(SDLOBJ)/debugqtlogwindow.moc.o \
480   $(SDLOBJ)/debugqtdasmwindow.moc.o \
481   $(SDLOBJ)/debugqtmainwindow.moc.o \
482   $(SDLOBJ)/debugqtmemorywindow.moc.o
483454else
484455DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
485456endif
r19859r19860
573544
574545ifdef USE_QTDEBUG
575546MOC = @moc
576$(SDLOBJ)/%.moc.c: $(SDLSRC)/%.h
577   $(MOC) $(MOCINCPATH) $(DEFS) $< -o $@
578
579DEBUGOBJS = \
580   $(SDLOBJ)/debugqt.o \
581   $(SDLOBJ)/debugqtview.o \
582   $(SDLOBJ)/debugqtwindow.o \
583   $(SDLOBJ)/debugqtlogwindow.o \
584   $(SDLOBJ)/debugqtdasmwindow.o \
585   $(SDLOBJ)/debugqtmainwindow.o \
586   $(SDLOBJ)/debugqtmemorywindow.o \
587   $(SDLOBJ)/debugqtwindow.moc.o \
588   $(SDLOBJ)/debugqtlogwindow.moc.o \
589   $(SDLOBJ)/debugqtdasmwindow.moc.o \
590   $(SDLOBJ)/debugqtmainwindow.moc.o \
591   $(SDLOBJ)/debugqtmemorywindow.moc.o
592547endif
593548
594549LIBS += -lSDL.dll
r19859r19860
611566# Debugging
612567#-------------------------------------------------
613568
569ifdef USE_QTDEBUG
570$(SDLOBJ)/%.moc.c: $(SDLSRC)/%.h
571   $(MOC) $(MOCINCPATH) $(DEFS) $< -o $@
572
573DEBUGOBJS = \
574   $(SDLOBJ)/debugqt.o \
575   $(SDLOBJ)/debugqtview.o \
576   $(SDLOBJ)/debugqtwindow.o \
577   $(SDLOBJ)/debugqtlogwindow.o \
578   $(SDLOBJ)/debugqtdasmwindow.o \
579   $(SDLOBJ)/debugqtmainwindow.o \
580   $(SDLOBJ)/debugqtmemorywindow.o \
581   $(SDLOBJ)/debugqtwindow.moc.o \
582   $(SDLOBJ)/debugqtlogwindow.moc.o \
583   $(SDLOBJ)/debugqtdasmwindow.moc.o \
584   $(SDLOBJ)/debugqtmainwindow.moc.o \
585   $(SDLOBJ)/debugqtmemorywindow.moc.o
586endif
587
614588ifeq ($(NO_DEBUGGER),1)
615589DEFS += -DNO_DEBUGGER
616590# debugwin compiles into a stub ...
trunk/src/osd/sdl/debugqtview.c
r19859r19860
2626{
2727    // Tell the MAME debug view how much real estate is available
2828    QFontMetrics actualFont = fontMetrics();
29    const int fontWidth = actualFont.maxWidth();
30    const int fontHeight = actualFont.height();
29    const int fontWidth = MAX(1, actualFont.maxWidth());
30    const int fontHeight = MAX(1, actualFont.height());
3131    m_view->set_visible_size(debug_view_xy(width()/fontWidth, height()/fontHeight));
3232
3333

Previous 199869 Revisions Next

© 1997-2024 The MAME Team