VirtualBox

Changeset 5680 in vbox for trunk


Ignore:
Timestamp:
Nov 11, 2007 9:40:50 AM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
26024
Message:

Trying to fix the double linking of the DBGC code (VBoxDBG and VBoxVMM), by making sure it gets into VBoxVMM when it is supposed to.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r5646 r5680  
    191191## the Direct Framebuffer GUI
    192192#VBOX_WITH_VBOXFB = 1
    193 # the gui debugger
     193# Enable the debugger.
    194194ifneq ($(BUILD_TYPE),release)
    195 VBOX_WITH_DEBUGGER_GUI = 1
     195 VBOX_WITH_DEBUGGER = 1
     196 # Enable the debugger GUI.
     197 VBOX_WITH_DEBUGGER_GUI = 1
    196198endif
    197199# the documentation
    … …  
    462464VBOX_ASFLAGS_FMT = -f win64 -DASM_FORMAT_PE
    463465 endif
     466VBOX_ASFLAGS_DBFINFO = -g cv8
    464467endif
    465468ifndef VBOX_ASFLAGS_FMT
    … …  
    481484ifeq ($(VBOX_LDR_FMT32),pe)
    482485 VBOX_ASFLAGS_FMT32 = -f win32 -DASM_FORMAT_PE
     486 VBOX_ASFLAGS_DBFINFO32 = -g cv8
    483487endif
    484488ifndef VBOX_ASFLAGS_FMT32
    … …  
    496500ifeq ($(VBOX_LDR_FMT64),pe)
    497501 VBOX_ASFLAGS_FMT64 = -f win64 -DASM_FORMAT_PE
     502 VBOX_ASFLAGS_DBFINFO64 = -g cv8
    498503endif
    499504ifndef VBOX_ASFLAGS_FMT64
    … …  
    506511 VBOX_LDR_FMT_2_YASM_DBGINFO.lx    = -g stabs
    507512 VBOX_LDR_FMT_2_YASM_DBGINFO.macho =
    508  VBOX_LDR_FMT_2_YASM_DBGINFO.pe    =
     513 VBOX_LDR_FMT_2_YASM_DBGINFO.pe    = -g cv8
    509514 VBOX_ASFLAGS   = $(VBOX_ASFLAGS_FMT)   -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT))
    510515 VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT32))

  • trunk/src/VBox/Debugger/Makefile.kmk

    r5677 r5680  
    1414#  distribution. VirtualBox OSE is distributed in the hope that it will
    1515#  be useful, but WITHOUT ANY WARRANTY of any kind.
     16#
    1617
    1718DEPTH = ../../..
    1819include $(PATH_KBUILD)/header.kmk
    1920
    20 LIBRARIES = Debugger
    21 ifdef VBOX_WITH_DEBUGGER_GUI
    22 DLLS      = VBoxDbg
    23 PROGRAMS  = tstVBoxDbg
     21#
     22# The targets.
     23#
     24ifdef VBOX_WITH_DEBUGGER
     25 LIBRARIES += Debugger
     26 ifdef VBOX_WITH_TESTCASES
     27  PROGRAMS += tstDBGCParser
     28 endif
     29 ifdef VBOX_WITH_DEBUGGER_GUI
     30  DLLS += VBoxDbg
     31  ifdef VBOX_WITH_TESTCASES
     32   PROGRAMS += tstVBoxDbg
     33  endif
     34 endif
     35endif # VBOX_WITH_DEBUGGER
     36ifndef VBOX_OSE
     37 INSTALLS.win.x86 += dbghelp
    2438endif
    2539
    26 ifndef VBOX_OSE
    27 INSTALLS.win.x86 = dbghelp
    28 endif
    29 
    30 
    31 #
    32 # Debugger library
     40
     41#
     42# Debugger library - linked into VBoxVMM.
    3343#
    3444Debugger_TEMPLATE  = VBOXR3
    … …  
    4454        DBGCTcp.cpp
    4555
    46 #
    47 # The testcase.
     56
     57#
     58# The DBGC parser testcase.
     59# This stubs all the VBoxVMM APIs.
     60#
     61tstDBGCParser_TEMPLATE = VBOXR3EXE
     62tstDBGCParser_SOURCES = \
     63        testcase/tstDBGCParser.cpp
     64tstDBGCParser_LIBS = \
     65        $(TARGET_Debugger) \
     66        $(LIB_RUNTIME)
     67
     68
     69#
     70# Debugger GUI component.
     71#
     72VBoxDbg_TEMPLATE = VBOXQTGUI
     73VBoxDbg_DEFS = IN_DBG_R3
     74VBoxDbg_CXXFLAGS.linux = $(TEMPLATE_VBOXQTGUI_CXXFLAGS.linux) -O2
     75VBoxDbg_CXXFLAGS.win = -wd4244
     76VBoxDbg_INCS = \
     77        . \
     78        $(PATH_VBoxDbg)/ui \
     79        $(PATH_VBoxDbg)/moc \
     80        $(PATH_VBoxDbg)/include
     81
     82# QDesigner UI sources
     83VBoxDbg_QT_UISRCS =
     84
     85# Headers containing definitions of classes that use the Q_OBJECT macro
     86VBoxDbg_QT_MOCHDRS = \
     87        VBoxDbgConsole.h \
     88        VBoxDbgStats.h \
     89        VBoxDbgGui.h
     90
     91# UI headers (ui.h) containing local definitions of classes that use the Q_OBJECT macro
     92VBoxDbg_QT_MOCUIHDRS =
     93
     94VBoxDbg_GENSRCS = \
     95        $(foreach moc,$(notdir $(basename $(VBoxDbg_QT_MOCHDRS))), $(PATH_VBoxDbg)/moc/moc_$(moc).cpp) \
     96        $(foreach ui,$(notdir $(basename $(VBoxDbg_QT_UISRCS))), $(PATH_VBoxDbg)/ui/$(ui).cpp $(PATH_VBoxDbg)/moc/moc_$(ui).cpp)
     97
     98VBoxDbg_GENHDRS = \
     99        $(foreach mocui,$(basename $(VBoxDbg_QT_MOCUIHDRS)), $(PATH_VBoxDbg)/moc/$(mocui).moc) \
     100        $(foreach moc,$(basename $(VBoxDbg_QT_MOCSRCS)), $(PATH_VBoxDbg)/moc/$(moc).moc) \
     101        $(foreach ui,$(basename $(VBoxDbg_QT_UISRCS)), $(PATH_VBoxDbg)/$(ui).h)
     102
     103VBoxDbg_SOURCES    = \
     104        $(VBoxDbg_GENSRCS) \
     105        VBoxDbg.cpp \
     106        VBoxDbgGui.cpp \
     107        VBoxDbgBase.cpp \
     108        VBoxDbgConsole.cpp \
     109        VBoxDbgStats.cpp
     110
     111VBoxDbg_LIBS = \
     112        $(LIB_VMM)
     113
     114# generated files we need to clean manually
     115VBoxDbg_CLEAN += \
     116        $(VBoxDbg_GENSRCS) \
     117        $(VBoxDbg_GENHDRS)
     118
     119
     120#
     121# The VBoxDBG testcase.
    48122#
    49123tstVBoxDbg_TEMPLATE     = VBOXQTGUIEXE
    … …  
    59133        $(PATH_BIN)/VBoxDbg$(VBOX_SUFF_DLL)
    60134endif
    61 
    62 
    63 #
    64 # Debugger GUI component.
    65 #
    66 VBoxDbg_TEMPLATE = VBOXQTGUI
    67 VBoxDbg_DEFS = IN_DBG_R3
    68 VBoxDbg_CXXFLAGS.linux = $(TEMPLATE_VBOXQTGUI_CXXFLAGS.linux) -O2
    69 VBoxDbg_CXXFLAGS.win = -wd4244
    70 VBoxDbg_INCS = \
    71         . \
    72         $(PATH_VBoxDbg)/ui \
    73         $(PATH_VBoxDbg)/moc \
    74         $(PATH_VBoxDbg)/include
    75 
    76 # QDesigner UI sources
    77 VBoxDbg_QT_UISRCS =
    78 
    79 # Headers containing definitions of classes that use the Q_OBJECT macro
    80 VBoxDbg_QT_MOCHDRS = \
    81         VBoxDbgConsole.h \
    82         VBoxDbgStats.h \
    83         VBoxDbgGui.h
    84 
    85 # UI headers (ui.h) containing local definitions of classes that use the Q_OBJECT macro
    86 VBoxDbg_QT_MOCUIHDRS =
    87 
    88 VBoxDbg_GENSRCS = \
    89         $(foreach moc,$(notdir $(basename $(VBoxDbg_QT_MOCHDRS))), $(PATH_VBoxDbg)/moc/moc_$(moc).cpp) \
    90         $(foreach ui,$(notdir $(basename $(VBoxDbg_QT_UISRCS))), $(PATH_VBoxDbg)/ui/$(ui).cpp $(PATH_VBoxDbg)/moc/moc_$(ui).cpp)
    91 
    92 VBoxDbg_GENHDRS = \
    93         $(foreach mocui,$(basename $(VBoxDbg_QT_MOCUIHDRS)), $(PATH_VBoxDbg)/moc/$(mocui).moc) \
    94         $(foreach moc,$(basename $(VBoxDbg_QT_MOCSRCS)), $(PATH_VBoxDbg)/moc/$(moc).moc) \
    95         $(foreach ui,$(basename $(VBoxDbg_QT_UISRCS)), $(PATH_VBoxDbg)/$(ui).h)
    96 
    97 VBoxDbg_SOURCES    = \
    98         $(VBoxDbg_GENSRCS) \
    99         VBoxDbg.cpp \
    100         VBoxDbgGui.cpp \
    101         VBoxDbgBase.cpp \
    102         VBoxDbgConsole.cpp \
    103         VBoxDbgStats.cpp \
    104         DBGConsole.cpp \
    105         DBGCBuiltInSymbols.cpp \
    106         DBGCCmdHlp.cpp \
    107         DBGCCmdWorkers.cpp \
    108         DBGCCommands.cpp \
    109         DBGCEmulateCodeView.cpp \
    110         DBGCOps.cpp
    111 
    112 VBoxDbg_LIBS = $(LIB_VMM)
    113 
    114 # generated files we need to clean manually
    115 VBoxDbg_CLEAN += \
    116         $(VBoxDbg_GENSRCS) \
    117         $(VBoxDbg_GENHDRS)
    118135
    119136

  • trunk/src/VBox/VMM/VBoxVMMDeps.cpp

    r4665 r5680  
    2626#include <VBox/iom.h>
    2727#include <VBox/dbgf.h>
     28#include <VBox/dbg.h>
    2829
    2930VMMR3DECL(int) VMMDoTest(PVM pVM);
    … …  
    4647    (PFNRT)VMR3Create,
    4748    (PFNRT)VMMDoTest,
     49#ifdef VBOX_WITH_DEBUGGER
     50    (PFNRT)DBGCCreate,
     51#endif
    4852    NULL
    4953};
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette