VirtualBox

Changeset 10346 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Jul 7, 2008 11:45:01 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
32974
Message:

Moved DEFS into the right place (before SOURCES). LIBS and LDFLAGS was also put before SOURCES, because SOURCES are a mess and goes on for half of the file. :-)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

    r10345 r10346  
    421421 endif
    422422endif # darwin
     423
     424VirtualBox4_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
     425VirtualBox4_DEFS.debug     = VBOX_GUI_DEBUG VBOX_CHECK_STATE # QT_FATAL_ASSERT
     426VirtualBox4_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
     427VirtualBox4_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
     428VirtualBox4_DEFS.linux     = VBOX_GUI_USE_SDL
     429VirtualBox4_DEFS.netbsd    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
     430VirtualBox4_DEFS.openbsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
     431VirtualBox4_DEFS.solaris   = VBOX_GUI_USE_QIMAGE #VBOX_GUI_USE_SDL
     432VirtualBox4_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
     433VirtualBox4_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
     434#ifndef VBOX_OSE
     435## @todo VBOX_WITH_HACKED_QT doesn't apply to Qt4, so why is this still here?
     436 VirtualBox4_DEFS.darwin  += VBOX_WITH_HACKED_QT
     437#endif
     438ifdef VBOX_WITH_ICHAT_THEATER
     439 VirtualBox4_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
     440endif
     441ifneq ($(KBUILD_TYPE),release)
     442 # non-release builds has some extra features.
     443 VirtualBox4_DEFS.win     += VBOX_GUI_USE_DDRAW
     444 VirtualBox4_DEFS.linux   += VBOX_GUI_USE_QIMAGE
     445endif
     446ifdef VBOX_WITH_REGISTRATION
     447 VirtualBox4_DEFS         += VBOX_WITH_REGISTRATION
     448endif
     449ifdef VBOX_WITH_REGISTRATION_REQUEST
     450 VirtualBox4_DEFS         += VBOX_WITH_REGISTRATION_REQUEST
     451endif
     452ifdef VBOX_WITH_ALSA
     453 VirtualBox4_DEFS         += VBOX_WITH_ALSA
     454endif
     455ifdef VBOX_WITH_PULSE
     456 VirtualBox4_DEFS         += VBOX_WITH_PULSE
     457endif
     458ifdef VBOX_WITH_E1000
     459 VirtualBox4_DEFS         += VBOX_WITH_E1000
     460endif
     461ifdef VBOX_OSE
     462 VirtualBox4_DEFS         += VBOX_OSE
     463endif
     464ifdef VBOX_WITH_DEBUGGER_GUI
     465 VirtualBox4_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
     466endif
     467
     468VirtualBox4_INCS           = \
     469        ./include \
     470        $(PATH_VirtualBox4)/include
     471ifndef USE_KBUILD_QT_UNIT
     472 VirtualBox4_INCS         += \
     473        $(PATH_VirtualBox4)/ui \
     474        $(PATH_VirtualBox4)/moc
     475endif
     476
     477
     478ifeq ($(KBUILD_TYPE),release)
     479 VirtualBox4_LDFLAGS.win  += /SUBSYSTEM:windows
     480else
     481 VirtualBox4_LDFLAGS.linux+= -rdynamic # for backtrace_symbols()
     482 ifeq ($(USERNAME),dmik)
     483  VirtualBox4_LDFLAGS.win += /SUBSYSTEM:windows
     484 else
     485  VirtualBox4_LDFLAGS.win += /SUBSYSTEM:console
     486 endif
     487endif
     488VirtualBox4_LDFLAGS.darwin = -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -lz
     489ifdef VBOX_WITH_ICHAT_THEATER
     490 VirtualBox4_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
     491endif
     492VirtualBox4_LIBS.win       = \
     493        $(PATH_SDK_WINPSDK_LIB)/Htmlhelp.Lib \
     494        $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
     495        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
     496ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
     497 VirtualBox4_LIBS         += $(PATH_DLL)/VBoxKeyboard4$(VBOX_SUFF_DLL)
     498endif
     499
     500ifdef VBOX_WITH_DEBUGGER_GUI ## @todo make this dynamically loadable and ship with release builds too.
     501 ifeq ($(KBUILD_TARGET),win)
     502  VirtualBox4_LIBS        += $(PATH_LIB)/VBoxDbg$(VBOX_SUFF_LIB)
     503 else
     504  VirtualBox4_LIBS        += $(PATH_DLL)/VBoxDbg$(VBOX_SUFF_DLL)
     505 endif
     506endif
     507
    423508
    424509# Headers containing definitions of classes that use the Q_OBJECT macro.
    … …  
    479564
    480565# Sources containing local definitions of classes that use the Q_OBJECT macro.
    481 VirtualBox4_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
     566VirtualBox4_QT_MOCSRCS = \
     567        src/VBoxSelectorWnd.cpp
    482568ifdef VBOX_WITH_XPCOM
    483  VirtualBox4_QT_MOCSRCS += src/COMDefs.cpp
     569 VirtualBox4_QT_MOCSRCS += \
     570        src/COMDefs.cpp
    484571endif
    485572
    … …  
    563650        src/darwin/VBoxUtils-darwin.cpp \
    564651        src/VBoxFBQuartz2D.cpp
    565 #       src/darwin/VBoxAquaStyle.cpp \
     652#       src/darwin/VBoxAquaStyle.cpp
    566653
    567654ifdef VBOX_WITH_ICHAT_THEATER
    568655 VirtualBox4_SOURCES.darwin += \
    569656         src/darwin/VBoxIChatTheaterWrapper.m
    570 endif
    571 
    572 VirtualBox4_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
    573 VirtualBox4_DEFS.debug     = VBOX_GUI_DEBUG VBOX_CHECK_STATE # QT_FATAL_ASSERT
    574 VirtualBox4_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
    575 VirtualBox4_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    576 VirtualBox4_DEFS.linux     = VBOX_GUI_USE_SDL
    577 VirtualBox4_DEFS.netbsd    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    578 VirtualBox4_DEFS.openbsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    579 VirtualBox4_DEFS.solaris   = VBOX_GUI_USE_QIMAGE #VBOX_GUI_USE_SDL
    580 VirtualBox4_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
    581 VirtualBox4_DEFS.win.amd64 = VBOX_WITHOUT_QHTTP
    582 #ifndef VBOX_OSE
    583 ## @todo VBOX_WITH_HACKED_QT doesn't apply to Qt4, so why is this still here?
    584  VirtualBox4_DEFS.darwin  += VBOX_WITH_HACKED_QT
    585 #endif
    586 ifdef VBOX_WITH_ICHAT_THEATER
    587  VirtualBox4_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
    588 endif
    589 ifneq ($(KBUILD_TYPE),release)
    590  # non-release builds has some extra features.
    591  VirtualBox4_DEFS.win     += VBOX_GUI_USE_DDRAW
    592  VirtualBox4_DEFS.linux   += VBOX_GUI_USE_QIMAGE
    593 endif
    594 ifdef VBOX_WITH_REGISTRATION
    595  VirtualBox4_DEFS         += VBOX_WITH_REGISTRATION
    596 endif
    597 ifdef VBOX_WITH_REGISTRATION_REQUEST
    598  VirtualBox4_DEFS         += VBOX_WITH_REGISTRATION_REQUEST
    599 endif
    600 ifdef VBOX_WITH_ALSA
    601  VirtualBox4_DEFS         += VBOX_WITH_ALSA
    602 endif
    603 ifdef VBOX_WITH_PULSE
    604  VirtualBox4_DEFS         += VBOX_WITH_PULSE
    605 endif
    606 ifdef VBOX_WITH_E1000
    607  VirtualBox4_DEFS         += VBOX_WITH_E1000
    608 endif
    609 ifdef VBOX_OSE
    610  VirtualBox4_DEFS         += VBOX_OSE
    611 endif
    612 ifdef VBOX_WITH_DEBUGGER_GUI
    613  VirtualBox4_DEFS         += VBOX_WITH_DEBUGGER_GUI_MENU
    614 endif
    615 
    616 VirtualBox4_INCS           = \
    617         ./include \
    618         $(PATH_VirtualBox4)/ui \
    619         $(PATH_VirtualBox4)/moc \
    620         $(PATH_VirtualBox4)/include \
    621 
    622 
    623 ifeq ($(KBUILD_TYPE),release)
    624  VirtualBox4_LDFLAGS.win  += /SUBSYSTEM:windows
    625 else
    626  VirtualBox4_LDFLAGS.linux+= -rdynamic # for backtrace_symbols()
    627  ifeq ($(USERNAME),dmik)
    628   VirtualBox4_LDFLAGS.win += /SUBSYSTEM:windows
    629  else
    630   VirtualBox4_LDFLAGS.win += /SUBSYSTEM:console
    631  endif
    632 endif
    633 VirtualBox4_LDFLAGS.darwin = -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -lz
    634 ifdef VBOX_WITH_ICHAT_THEATER
    635  VirtualBox4_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
    636 endif
    637 VirtualBox4_LIBS.win       = \
    638         $(PATH_SDK_WINPSDK_LIB)/Htmlhelp.Lib \
    639         $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
    640         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    641 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    642  VirtualBox4_LIBS         += $(PATH_DLL)/VBoxKeyboard4$(VBOX_SUFF_DLL)
    643 endif
    644 
    645 
    646 ifdef VBOX_WITH_DEBUGGER_GUI ## @todo make this dynamically loadable and ship with release builds too.
    647  ifeq ($(KBUILD_TARGET),win)
    648   VirtualBox4_LIBS        += $(PATH_LIB)/VBoxDbg$(VBOX_SUFF_LIB)
    649  else
    650   VirtualBox4_LIBS        += $(PATH_DLL)/VBoxDbg$(VBOX_SUFF_DLL)
    651  endif
    652657endif
    653658
    … …  
    763768        $(RM) -f $@
    764769        $(APPEND) $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
    765         $(CAT) $@
    766 
    767 OTHER_CLEAN.win += $(PATH_TARGET)/VirtualBox4.rc
     770
     771VirtualBox4_CLEAN.win += $(PATH_TARGET)/VirtualBox4.rc
    768772
    769773
    … …  
    771775# Other stuff.
    772776#
    773 WRAPPERSFILE        = $(PATH_VirtualBox4)/include/COMWrappers.h
     777VBOX_WRAPPERS_FILE4 = $(PATH_VirtualBox4)/include/COMWrappers.h
    774778VirtualBox4_BLDDIRS += $(PATH_VirtualBox4)/include/
    775 VirtualBox4_INTERMEDIATES = $(WRAPPERSFILE)
    776 
    777 WRAPPERSINCFILE    = include/COMDefs.h
    778 WRAPPERSTEMPLATE    = include/COMWrappers.xsl
    779 XIDLFILE            = ../../Main/idl/VirtualBox.xidl
     779VirtualBox4_INTERMEDIATES = $(VBOX_WRAPPERS_FILE4)
     780
     781VBOX_WRAPPERS_INC_FILE4 = include/COMDefs.h
     782VBOX_WRAPPERS_TEMPLATE4 = include/COMWrappers.xsl
     783VBOX_WRAPPERS_XIDLFILE4 = ../../Main/idl/VirtualBox.xidl
    780784
    781785
    782786
    783787# generated files we need to clean manually
    784 OTHER_CLEAN           = \
     788OTHER_CLEAN = \
    785789        $(VirtualBox4_GENSRCS) \
    786790        $(VirtualBox4_GENHDRS) \
    787         $(WRAPPERSFILE) \
     791        $(VBOX_WRAPPERS_FILE4) \
    788792        $(PATH_BIN)/vboxkeyboard.tar.gz
    789793
    … …  
    10551059# Generate the COM wrappers.
    10561060#
    1057 $(WRAPPERSINCFILE): $(WRAPPERSFILE)
    1058 
    1059 $(WRAPPERSFILE): $(XIDLFILE) $(WRAPPERSTEMPLATE) | $(call DIRDEP,$(PATH_VirtualBox4)/include/)
     1061$(VBOX_WRAPPERS_INC_FILE4): $(VBOX_WRAPPERS_FILE4)
     1062
     1063$(VBOX_WRAPPERS_FILE4): $(VBOX_WRAPPERS_XIDLFILE4) $(VBOX_WRAPPERS_TEMPLATE4) | $(call DIRDEP,$(PATH_VirtualBox4)/include/)
    10601064        $(call MSG_TOOL,xsltproc,VirtualBox4,$<,$@)
    1061         $(QUIET)$(VBOX_XSLTPROC) -o $@ $(WRAPPERSTEMPLATE) $<
     1065        $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_WRAPPERS_TEMPLATE4) $<
    10621066
    10631067
    … …  
    11031107
    11041108# alias for generating the COM Wrappers file.
    1105 testwrappers:: $(WRAPPERSFILE)
    1106 
     1109testwrappers:: $(VBOX_WRAPPERS_FILE4)
     1110
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