Changeset 10102 in vbox for trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk
- Timestamp:
- Jul 2, 2008 1:00:36 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 32602
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk
r10096 r10102 24 24 25 25 # Import QDesigner UI sources 26 VirtualBox_QT_UISRCS 3:= $(FORMS)26 VirtualBox_QT_UISRCS := $(FORMS) 27 27 # Import translation sources 28 28 VirtualBox_QT_TRANSLATIONS := $(TRANSLATIONS) … … 139 139 VBOX_DEFS_QT4 += QT3_SUPPORT QT_SHARED HAVE_CONFIG_H QT_NO_DEBUG 140 140 141 VBOX_UIC3 ?= $(VBOX_PATH_QT4_BIN)/uic3142 141 VBOX_UIC4 ?= $(VBOX_PATH_QT4_BIN)/uic 143 142 VBOX_MOC4 ?= $(VBOX_PATH_QT4_BIN)/moc … … 348 347 # 349 348 ifndef VBOX_WITH_REGISTRATION 350 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS3)) 351 endif 352 353 354 # 355 # filter ported UI content 356 # 357 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxCloseVMDlg.ui,$(VirtualBox_QT_UISRCS3)) 358 VirtualBox_QT_UISRCS4 += ui/VBoxCloseVMDlg.ui 359 360 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxNewVMWzd.ui,$(VirtualBox_QT_UISRCS3)) 361 VirtualBox_QT_UISRCS4 += ui/VBoxNewVMWzd.ui 362 363 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxNewHDWzd.ui,$(VirtualBox_QT_UISRCS3)) 364 VirtualBox_QT_UISRCS4 += ui/VBoxNewHDWzd.ui 365 366 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMFirstRunWzd.ui,$(VirtualBox_QT_UISRCS3)) 367 VirtualBox_QT_UISRCS4 += ui/VBoxVMFirstRunWzd.ui 368 369 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS3)) 370 VirtualBox_QT_UISRCS4 += ui/VBoxRegistrationDlg.ui 371 372 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxSnapshotDetailsDlg.ui,$(VirtualBox_QT_UISRCS3)) 373 VirtualBox_QT_UISRCS4 += ui/VBoxSnapshotDetailsDlg.ui 374 375 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMInformationDlg.ui,$(VirtualBox_QT_UISRCS3)) 376 VirtualBox_QT_UISRCS4 += ui/VBoxVMInformationDlg.ui 377 378 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxTakeSnapshotDlg.ui,$(VirtualBox_QT_UISRCS3)) 379 VirtualBox_QT_UISRCS4 += ui/VBoxTakeSnapshotDlg.ui 380 381 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxSnapshotsWgt.ui,$(VirtualBox_QT_UISRCS3)) 382 VirtualBox_QT_UISRCS4 += ui/VBoxSnapshotsWgt.ui 383 384 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMLogViewer.ui,$(VirtualBox_QT_UISRCS3)) 385 VirtualBox_QT_UISRCS4 += ui/VBoxVMLogViewer.ui 386 387 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxDiskImageManagerDlg.ui,$(VirtualBox_QT_UISRCS3)) 388 VirtualBox_QT_UISRCS4 += ui/VBoxDiskImageManagerDlg.ui 389 390 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsGeneral.ui,$(VirtualBox_QT_UISRCS3)) 391 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsGeneral.ui 392 393 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsHD.ui,$(VirtualBox_QT_UISRCS3)) 394 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsHD.ui 395 396 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsCD.ui,$(VirtualBox_QT_UISRCS3)) 397 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsCD.ui 398 399 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsFD.ui,$(VirtualBox_QT_UISRCS3)) 400 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsFD.ui 401 402 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsAudio.ui,$(VirtualBox_QT_UISRCS3)) 403 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsAudio.ui 404 405 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsNetwork.ui,$(VirtualBox_QT_UISRCS3)) 406 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsNetwork.ui 407 408 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsSerial.ui,$(VirtualBox_QT_UISRCS3)) 409 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsSerial.ui 410 411 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsParallel.ui,$(VirtualBox_QT_UISRCS3)) 412 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsParallel.ui 413 414 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsUSB.ui,$(VirtualBox_QT_UISRCS3)) 415 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsUSB.ui 416 417 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsSF.ui,$(VirtualBox_QT_UISRCS3)) 418 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsSF.ui 419 420 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsVRDP.ui,$(VirtualBox_QT_UISRCS3)) 421 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsVRDP.ui 422 423 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsDlg.ui,$(VirtualBox_QT_UISRCS3)) 424 VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsDlg.ui 425 426 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxGlobalSettingsGeneral.ui,$(VirtualBox_QT_UISRCS3)) 427 VirtualBox_QT_UISRCS4 += ui/VBoxGlobalSettingsGeneral.ui 428 429 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxGlobalSettingsInput.ui,$(VirtualBox_QT_UISRCS3)) 430 VirtualBox_QT_UISRCS4 += ui/VBoxGlobalSettingsInput.ui 431 432 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxGlobalSettingsLanguage.ui,$(VirtualBox_QT_UISRCS3)) 433 VirtualBox_QT_UISRCS4 += ui/VBoxGlobalSettingsLanguage.ui 434 435 VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxGlobalSettingsDlg.ui,$(VirtualBox_QT_UISRCS3)) 436 VirtualBox_QT_UISRCS4 += ui/VBoxGlobalSettingsDlg.ui 349 VirtualBox_QT_UISRCS := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS)) 350 endif 437 351 438 352 # … … 445 359 endif 446 360 INSTALLS = VirtualBox.nls bin 447 448 ifeq ($(KBUILD_TARGET),os2)449 DLLS += VBoxHlp450 ifneq ($(strip $(VBOX_DLL_QT)),)451 INSTALLS += qt.dll452 qt.dll_INST = $(INST_BIN)453 qt.dll_SOURCES += \454 $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT))455 endif456 endif457 458 459 #460 # VBoxHlp - helper DLL for OS/2.461 #462 VBoxHlp_ASTOOL = NASM463 VBoxHlp_ASFLAGS = -f obj464 VBoxHlp_DEFS = IN_RING3 IN_VBOXHLP465 VBoxHlp_CXXFLAGS = -fno-exceptions466 VBoxHlp_LDFLAGS = -nostdlib -los2467 VBoxHlp_LDFLAGS += -Zlinker option -Zlinker manyautodata468 VBoxHlp_SOURCES = \469 src/os2/VBoxHlp.asm \470 src/os2/VBoxHlp.cpp471 472 361 473 362 # … … 612 501 # generation rules defined somewhere below! 613 502 VirtualBox_GENSRCS = \ 614 $(foreach moc,$(notdir $(basename $(VirtualBox_QT_MOCHDRS))), $(PATH_VirtualBox)/moc/moc_$(moc).cpp) \ 615 $(foreach ui,$(notdir $(basename $(VirtualBox_QT_UISRCS3))), $(PATH_VirtualBox)/ui/$(ui).cpp $(PATH_VirtualBox)/moc/moc_$(ui).cpp) 503 $(foreach moc,$(notdir $(basename $(VirtualBox_QT_MOCHDRS))), $(PATH_VirtualBox)/moc/moc_$(moc).cpp) 616 504 617 505 # All generated headers. Note: this list MUST be in sync with Qt source … … 619 507 VirtualBox_GENHDRS = \ 620 508 $(foreach moc,$(notdir $(basename $(VirtualBox_QT_MOCSRCS))), $(PATH_VirtualBox)/moc/$(moc).moc) \ 621 $(foreach ui,$(notdir $(basename $(VirtualBox_QT_UISRCS3))), $(PATH_VirtualBox)/ui/$(ui).h) \ 622 $(foreach ui,$(notdir $(basename $(VirtualBox_QT_UISRCS4))), $(PATH_VirtualBox)/ui/$(ui).gen.h) 623 624 # All existing .ui.h files for known .ui sources 625 VirtualBox_QT_UIHDRS = \ 626 $(wildcard $(addsuffix .h,$(VirtualBox_QT_UISRCS3))) 509 $(foreach ui,$(notdir $(basename $(VirtualBox_QT_UISRCS))), $(PATH_VirtualBox)/ui/$(ui).gen.h) 627 510 628 511 # All header files 629 512 VirtualBox_HEADERS = \ 630 513 $(wildcard include/*.h) \ 631 $(VirtualBox_GENHDRS) \ 632 $(VirtualBox_QT_UIHDRS) 633 514 $(VirtualBox_GENHDRS) 634 515 635 516 VirtualBox_SOURCES = \ … … 741 622 VirtualBox_DEFS.netbsd = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL 742 623 VirtualBox_DEFS.openbsd = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL 743 VirtualBox_DEFS.os2 = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL QT_DLL744 624 VirtualBox_DEFS.solaris = VBOX_GUI_USE_QIMAGE #VBOX_GUI_USE_SDL 745 625 VirtualBox_DEFS.win = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL … … 795 675 endif 796 676 endif 797 VirtualBox_LDFLAGS.os2 = -Zlinker /PM:PM -Zno-fork798 677 VirtualBox_LDFLAGS.darwin = -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -lz 799 678 ifdef VBOX_WITH_ICHAT_THEATER … … 804 683 $(PATH_SDK_DXSDK_LIB)/ddraw.lib \ 805 684 $(PATH_SDK_DXSDK_LIB)/dxguid.lib 806 VirtualBox_LIBS.os2 += $(PATH_DLL)/VBoxHlp$(VBOX_SUFF_DLL)807 685 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11 808 686 VirtualBox_LIBS += $(PATH_DLL)/VBoxKeyboard4$(VBOX_SUFF_DLL) … … 927 805 928 806 # OSE version is always necessary for lupdate/lrelease 929 VirtualBox_QT_UISRCS 4+= ui/VBoxAboutDlg.ui807 VirtualBox_QT_UISRCS += ui/VBoxAboutDlg.ui 930 808 931 809 # Commit the magic. … … 1008 886 endef 1009 887 1010 ## Generate a rule to create a header and source files from an UI3888 ## Generate a rule to create a header file from an UI 1011 889 # definition source (.ui). 1012 890 # @param $uifile UI definintion source file 1013 define def_qt_gen_src_ui3 1014 1015 $(eval uisrc := $(PATH_$(target))/ui/$(notdir $(basename $(uifile))).cpp) 1016 $(eval uihdr := $(PATH_$(target))/ui/$(notdir $(basename $(uifile))).h) 1017 $(eval mocsrc := $(PATH_$(target))/moc/moc_$(notdir $(basename $(uifile))).cpp) 1018 1019 1020 $(target)_GENSRCS_REAL += $(uisrc) $(mocsrc) 1021 $(target)_GENHDRS_REAL += $(uihdr) 1022 $(target)_INTERMEDIATES += $(uihdr) 1023 ## @todo The source should be added to GEN_SOURCES: $ (target)_GEN_SOURCES += $ (uisrc) $ (mocsrc) 1024 1025 $(uihdr): $(uifile) | $$(call DIRDEP,$(dir $(uihdr))) 1026 $$(call MSG_TOOL,uic,$(target),$(uifile),$$@) 1027 $$(QUIET)$$(VBOX_UIC3) $(uifile) -o $$@ 1028 1029 $(uisrc): $(uihdr) $(uifile) $(wildcard $(uifile).h) | $$(call DIRDEP,$(dir $(uisrc))) 1030 $$(call MSG_TOOL,uic,$(target),$(uifile),$$@) 1031 $$(QUIET)$$(VBOX_UIC3) -impl $(uihdr) $(uifile) -o $$@ 1032 1033 #$$(QUIET)$$(VBOX_UIC3) $(uifile) -i $(uihdr) -o $$@ 1034 1035 $(mocsrc): $(uihdr) | $$(call DIRDEP,$(dir $(mocsrc))) 1036 $$(call MSG_TOOL,moc,$(target),$(uihdr),$$@) 1037 $$(QUIET)$$(VBOX_MOC4) \ 1038 $(addprefix -D,$($(target)_DEFS)) \ 1039 $(addprefix -I,$($(target)_INCS)) \ 1040 $(uihdr) -o $$@ 1041 1042 endef 1043 1044 ## Generate a rule to create a header file from an UI4 1045 # definition source (.ui). 1046 # @param $uifile UI definintion source file 1047 define def_qt_gen_src_ui4 891 define def_qt_gen_src_ui 1048 892 1049 893 $(eval uihdr := $(PATH_$(target))/ui/$(notdir $(basename $(uifile))).gen.h) … … 1094 938 # moc includes from UI headers with Q_OBJECT 1095 939 $(foreach mocuihdr,$($(target)_QT_MOCUIHDRS),$(eval $(def_qt_gen_inc_mocuihdr))) 1096 # UI3 sources 1097 $(foreach uifile,$($(target)_QT_UISRCS3),$(eval $(def_qt_gen_src_ui3))) 1098 # UI4 sources 1099 $(foreach uifile,$($(target)_QT_UISRCS4),$(eval $(def_qt_gen_src_ui4))) 940 # UI sources 941 $(foreach uifile,$($(target)_QT_UISRCS),$(eval $(def_qt_gen_src_ui))) 1100 942 # NLS files 1101 943 $(foreach tsfile,$($(target)_QT_TRANSLATIONS),$(eval $(def_qt_gen_nls))) … … 1148 990 # currently disabled, because will cause all UI sources to be rebuilt one a 1149 991 # single one changes. 1150 #$(patsubst %,$(PATH_VirtualBox)/ui/%.cpp,$(notdir $(basename $(VirtualBox_QT_UISRCS 3)))) : $(VirtualBox_GENHDRS)992 #$(patsubst %,$(PATH_VirtualBox)/ui/%.cpp,$(notdir $(basename $(VirtualBox_QT_UISRCS)))) : $(VirtualBox_GENHDRS) 1151 993 1152 994
Note:
See TracChangeset
for help on using the changeset viewer.
