Changeset 3401 in vbox

Timestamp:

Jul 3, 2007 8:32:18 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22602

Message:

VBOX_SUFF_OBJ for working around an OS/2 SUFF_OBJ/GXX3OMF artifact.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Debugger/Makefile.kmk (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -1006 +1006 @@
 endif
 VBOX_SUFF_DLL = $(SUFF_DLL)
+ifeq ($(BUILD_TARGET),os2) # GXX3OMF produces out .o at the moment.
+VBOX_SUFF_OBJ = .o
+else
+VBOX_SUFF_OBJ = $(SUFF_OBJ)
+endif
 VBOXW32GUEST_SUFF_LIB = .lib
 VBOXLNX32GUEST_SUFF_LIB = .a

trunk/src/VBox/Debugger/Makefile.kmk

@@ -142 +142 @@
 #   @param  $mocsrc     the source file with Q_OBJECT
 define def_qt_gen_inc_moc
-$(eval mocobj := $(PATH_$(target)_$(mocsrc))/$(notdir $(basename $(mocsrc)))$(SUFF_OBJ))
+$(eval mocobj := $(PATH_$(target)_$(mocsrc))/$(notdir $(basename $(mocsrc)))$(VBOX_SUFF_OBJ))
 $(eval mocinc := $(PATH_$(target))/moc/$(notdir $(basename $(mocsrc))).moc)
 $$(mocobj): $(mocinc)
@@ -158 +158 @@
 define def_qt_gen_inc_mocuihdr
 $(eval uisrc    := $(PATH_$(target))/ui/$(notdir $(basename $(basename $(mocuihdr)))).cpp)
-$(eval uiobj    := $(PATH_$(target)_$(uisrc))/$(notdir $(basename $(uisrc)))$(SUFF_OBJ))
+$(eval uiobj    := $(PATH_$(target)_$(uisrc))/$(notdir $(basename $(uisrc)))$(VBOX_SUFF_OBJ))
 $(eval mocuiinc := $(PATH_$(target))/moc/$(notdir $(basename $(mocuihdr))).moc)
 $$(uisrc): $(mocuiinc)
@@ -228 +228 @@
 # Hand made dependencies go here
 #
-$(PATH_VBoxDbg)/gen/ui/VBoxNewVMWzd$(SUFF_OBJ):        $(PATH_VBoxDbg)/ui/VBoxNewVMWzd.h $(PATH_VBoxDbg)/ui/VBoxDiskImageMgrDlg.h
-$(PATH_VBoxDbg)/gen/ui/VBoxDiskImageMgrDlg$(SUFF_OBJ): ui/VBoxDiskImageMgrDlg.ui $(PATH_VBoxDbg)/ui/VBoxNewHDWzd.h
-$(PATH_VBoxDbg)/gen/ui/VBoxCloseVMDlg$(SUFF_OBJ):      $(PATH_VBoxDbg)/ui/VBoxCloseVMDlg.h
+$(PATH_VBoxDbg)/gen/ui/VBoxNewVMWzd$(VBOX_SUFF_OBJ):        $(PATH_VBoxDbg)/ui/VBoxNewVMWzd.h $(PATH_VBoxDbg)/ui/VBoxDiskImageMgrDlg.h
+$(PATH_VBoxDbg)/gen/ui/VBoxDiskImageMgrDlg$(VBOX_SUFF_OBJ): ui/VBoxDiskImageMgrDlg.ui $(PATH_VBoxDbg)/ui/VBoxNewHDWzd.h
+$(PATH_VBoxDbg)/gen/ui/VBoxCloseVMDlg$(VBOX_SUFF_OBJ):      $(PATH_VBoxDbg)/ui/VBoxCloseVMDlg.h
 
 

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -330 +330 @@
 define def_qt_gen_inc_moc
 
-$(eval mocobj := $(PATH_$(target)_$(mocsrc))/$(notdir $(basename $(mocsrc)))$(SUFF_OBJ))
+$(eval mocobj := $(PATH_$(target)_$(mocsrc))/$(notdir $(basename $(mocsrc)))$(VBOX_SUFF_OBJ))
 $(eval mocinc := $(PATH_$(target))/moc/$(notdir $(basename $(mocsrc))).moc)
 
@@ -352 +352 @@
 
 $(eval uisrc    := $(PATH_$(target))/ui/$(notdir $(basename $(basename $(mocuihdr)))).cpp)
-$(eval uiobj    := $(PATH_$(target)_$$(uisrc))/$(notdir $(basename $$(uisrc)))$(SUFF_OBJ))
+$(eval uiobj    := $(PATH_$(target)_$$(uisrc))/$(notdir $(basename $$(uisrc)))$(VBOX_SUFF_OBJ))
 $(eval mocuiinc := $(PATH_$(target))/moc/$(notdir $(basename $(mocuihdr))).moc)